[DRBD-cvs] user by phil; some improvements by LGE [They were lost...

drbd-user@lists.linbit.com drbd-user@lists.linbit.com
Sat, 6 Mar 2004 09:45:33 +0100 (CET)


DRBD CVS committal

Author  : phil
Project : drbd
Module  : user

Dir     : drbd/user


Modified Files:
      Tag: rel-0_7-branch
	drbdsetup.c 


Log Message:
some improvements by LGE [They were lost in my inbox for some time...]
* Better error reporting in drbd_req_prepare_write()
* Use of SIGHUP for DRBD's inter thread synchronisation
* a fix to drbdsetup's "on-io-error" parser.

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/drbdsetup.c,v
retrieving revision 1.54.2.25
retrieving revision 1.54.2.26
diff -u -3 -r1.54.2.25 -r1.54.2.26
--- drbdsetup.c	4 Mar 2004 21:10:08 -0000	1.54.2.25
+++ drbdsetup.c	6 Mar 2004 08:45:28 -0000	1.54.2.26
@@ -405,6 +405,7 @@
       int c,i;
 
       PRINT_ARGV;
+      next_option:
       c = getopt_long(argc,argv,make_optstring(options),options,0);
       if(c == -1) break;
       switch(c)
@@ -416,7 +417,7 @@
 	  for(i=0;i<ARRY_SIZE(eh_names);i++) {
 	    if (strcmp(optarg,eh_names[i])==0) {
 	      cn->config.on_io_error=i;
-	      goto ok;
+	      goto next_option;
 	    }
 	  }
 	  fprintf(stderr,"%s: '%s' is an invalid on-io-error handler.\n",
@@ -427,7 +428,6 @@
 	case '?':
 	  return 20;
 	}
-    ok:
     }
   return 0;
 }