[DRBD-cvs] user by lars; avoid al_extent == 0

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : lars
Project : drbd
Module  : user

Dir     : drbd/user


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


Log Message:
avoid al_extent == 0
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Attic/drbdadm_main.c,v
retrieving revision 1.1.2.49
retrieving revision 1.1.2.50
diff -u -3 -r1.1.2.49 -r1.1.2.50
--- drbdadm_main.c	4 May 2004 12:00:13 -0000	1.1.2.49
+++ drbdadm_main.c	19 May 2004 19:52:47 -0000	1.1.2.50
@@ -605,6 +605,8 @@
   char *argv[] = { "/bin/bash", "-c", NULL, "drbdadm:verify_ips", NULL };
   int ex;
 
+  if (dry_run < 2) return;
+
   if (!(res && res->me   && res->me->address
 	    && res->peer && res->peer->address)) {
     fprintf(stderr, "OOPS, no resource info in verify_ips!\n");
@@ -792,7 +794,7 @@
       switch(c)
 	{
 	case 'd':
-	  dry_run=1;
+	  dry_run++;
 	  break;
 	case 'c':
 	  if(!strcmp(optarg,"-")) {
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/drbdsetup.c,v
retrieving revision 1.54.2.34
retrieving revision 1.54.2.35
diff -u -3 -r1.54.2.34 -r1.54.2.35
--- drbdsetup.c	19 May 2004 16:59:33 -0000	1.54.2.34
+++ drbdsetup.c	19 May 2004 19:52:47 -0000	1.54.2.35
@@ -60,7 +60,7 @@
 #define DEF_DEGR_WFC_TIMEOUT        60      // 60 Seconds
 #define DEF_SYNC_WFC_TIMEOUT         8      // 8 seconds
 #define DEF_SYNC_DEGR_WFC_TIMEOUT    4      // 4 seconds
-#define DEF_SYNC_AL_EXTENTS        128
+#define DEF_SYNC_AL_EXTENTS        127
 #define DEF_MAX_EPOCH_SIZE        2048      // entries
 #define DEF_MAX_BUFFERS           2048      // entries
 #define DEF_SNDBUF_SIZE           (2*65535) // ~128KB
@@ -834,6 +834,10 @@
 	    }
 	}
     }
+
+
+  if (cn.config.al_extents < 7)
+	cn.config.al_extents = 127;
 
   err=ioctl(drbd_fd,DRBD_IOCTL_SET_SYNC_CONFIG,&cn);
   if(err)