[DRBD-cvs] user by phil; * replaced drdb_get_lo_capacity() and dr...

drbd-user@lists.linbit.com drbd-user@lists.linbit.com
Thu, 5 Feb 2004 16:17:41 +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:
* replaced drdb_get_lo_capacity() and drbd_get_my_capacity() by 
  drbd_get_capacity().
* renamed lo_device to backing_bdev, and md_device to md_bdev to
  match the names used on L26.
* restructured drbd_ioctl_set_disk() a bit. 

[Untested. Will do testing as soon as all the checks for backing_bdev's
 and md_bdev's size are in.]

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/drbdsetup.c,v
retrieving revision 1.54.2.16
retrieving revision 1.54.2.17
diff -u -3 -r1.54.2.16 -r1.54.2.17
--- drbdsetup.c	17 Nov 2003 14:21:39 -0000	1.54.2.16
+++ drbdsetup.c	5 Feb 2004 15:17:36 -0000	1.54.2.17
@@ -517,12 +517,16 @@
     [LAAlreadyInUse]="Local address(port) already in use.",
     [OAAlreadyInUse]="Remove address(port) already in use.",
     [LDFDInvalid]="Filedescriptor for lower device is invalid.",
+    [MDFDInvalid]="Filedescriptor for meta device is invalid.",
     [LDAlreadyInUse]="Lower device already in use.",
     [LDNoBlockDev]="Lower device is not a block device.",
+    [MDNoBlockDev]="Meta device is not a block device.",
     [LDOpenFailed]="Open of lower device failed.",
+    [MDOpenFailed]="Open of meta device failed.",
     [LDDeviceTooSmall]="Low.dev. smaller than requested DRBD-dev. size.",
     [LDNoConfig]="You have to use the disk command first.",
-    [LDMounted]="Lower device is already mounted."
+    [LDMounted]="Lower device is already mounted.",
+    [MDMounted]="Lower device is already mounted."
   };
 
   if (err_no>ARRY_SIZE(etext) || err_no<0) err_no=0;