[DRBD-cvs] svn commit by lars - r3033 - in branches/drbd-8.1: . user - svnp run. Investigated 3019 to 3032 r3032 by lars on 20

[drbd-cvs at lists.linbit.com]

Author: lars
Date: 2007-08-28 22:18:46 +0200 (Tue, 28 Aug 2007)
New Revision: 3033

Modified:
   branches/drbd-8.1/
   branches/drbd-8.1/user/drbdmeta.c
Log:
svnp run. Investigated 3019 to 3032

r3032 by lars on 2007-08-28 22:01:18 +0200 (Die, 28 Aug 2007) 
  Ge?\195?\164nderte Pfade:
     M /branches/drbd-8.0/user/drbdmeta.c
  
  Explicit NULL argp for ioctls without arguments.
  Even if an ioctl does not take an argument,
  we still have to provide an explicit NULL.
  Otherwise we may fail with EFAULT "Bad address".
  This worked so far only by accident.
  




Property changes on: branches/drbd-8.1
___________________________________________________________________
Name: propagate:at:2
   - 3019
   + 3032

Modified: branches/drbd-8.1/user/drbdmeta.c
===================================================================
--- branches/drbd-8.1/user/drbdmeta.c	2007-08-28 20:01:18 UTC (rev 3032)
+++ branches/drbd-8.1/user/drbdmeta.c	2007-08-28 20:18:46 UTC (rev 3033)
@@ -905,7 +905,7 @@
 		exit(20);
 	}
 
-	if (ioctl(cfg->md_fd, BLKFLSBUF) == -1) {
+	if (ioctl(cfg->md_fd, BLKFLSBUF, NULL) == -1) {
 		PERROR("WARN: ioctl(,BLKFLSBUF,) failed");
 	}
 
@@ -1509,7 +1509,7 @@
 		PERROR("fsync() failed");
 		err = -1;
 	}
-	if (ioctl(cfg->md_fd, BLKFLSBUF) == -1) {
+	if (ioctl(cfg->md_fd, BLKFLSBUF, NULL) == -1) {
 		PERROR("ioctl(,BLKFLSBUF,) failed");
 		err = -1;
 	}