[DRBD-cvs] svn commit by phil - r2142 - in trunk: drbd drbd/linux user - Small pice of work on the new drbdsetup /dev/drbdX show

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-04-07 16:37:12 +0200 (Fri, 07 Apr 2006)
New Revision: 2142

Modified:
   trunk/drbd/drbd_fs.c
   trunk/drbd/drbd_sizeof_sanity_check.c
   trunk/drbd/linux/drbd.h
   trunk/user/drbdsetup.c
Log:
Small pice of work on the new drbdsetup /dev/drbdX show code.


Modified: trunk/drbd/drbd_fs.c
===================================================================
--- trunk/drbd/drbd_fs.c	2006-04-06 20:35:37 UTC (rev 2141)
+++ trunk/drbd/drbd_fs.c	2006-04-07 14:37:12 UTC (rev 2142)
@@ -601,6 +601,7 @@
 		bdevname(mdev->bc->md_bdev,cn.meta_device_name);
 		cn.meta_index=mdev->bc->md_index;
 		cn.on_io_error=mdev->bc->on_io_error;
+		cn.fencing=mdev->bc->fencing;
 		dec_local(mdev);
 	}
 	cn.state=mdev->state;

Modified: trunk/drbd/drbd_sizeof_sanity_check.c
===================================================================
--- trunk/drbd/drbd_sizeof_sanity_check.c	2006-04-06 20:35:37 UTC (rev 2141)
+++ trunk/drbd/drbd_sizeof_sanity_check.c	2006-04-07 14:37:12 UTC (rev 2142)
@@ -18,7 +18,7 @@
 	SZO(struct ioctl_net_config,	456)
 	SZO(struct ioctl_syncer_config,	 32)
 	SZO(struct ioctl_wait,		 16)
-	SZO(struct ioctl_get_config,	576)
+	SZO(struct ioctl_get_config,	580)
 	SZO(struct ioctl_get_uuids,      48)
 	if (err) printk("<3>ioctls won't work, aborting\n");
 	return err;

Modified: trunk/drbd/linux/drbd.h
===================================================================
--- trunk/drbd/linux/drbd.h	2006-04-06 20:35:37 UTC (rev 2141)
+++ trunk/drbd/linux/drbd.h	2006-04-07 14:37:12 UTC (rev 2142)
@@ -290,6 +290,7 @@
 	OUT int               lower_device_major;
 	OUT int               lower_device_minor;
 	OUT enum io_error_handler on_io_error;
+	OUT enum fencing_policy fencing;
 	OUT int               meta_device_major;
 	OUT int               meta_device_minor;
 	OUT int               meta_index;

Modified: trunk/user/drbdsetup.c
===================================================================
--- trunk/user/drbdsetup.c	2006-04-06 20:35:37 UTC (rev 2141)
+++ trunk/user/drbdsetup.c	2006-04-07 14:37:12 UTC (rev 2142)
@@ -1333,7 +1333,7 @@
     {
       printf("disk {\n");
       SHOW_H("on-io-error",cn.on_io_error,DEF_ON_IO_ERROR,eh_names);
-      // SHOW_H("fencing",cn.fencing,DEF_FENCING,fencing_names);
+      SHOW_H("fencing\t",cn.fencing,DEF_FENCING,fencing_names);
       if( cn.disk_size_user ) printf("\tsize\t%luK;\n",
 				     (unsigned long)cn.disk_size_user);
       printf("}\n");
@@ -1341,6 +1341,7 @@
 
   if( cn.state.conn > StandAlone)
     {
+      printf("protocol %c;\n",'A'-1+cn.nconf.wire_protocol);
       printf("net {\n");
       SHOW_I("timeout","1/10 seconds",cn.nconf.timeout,DEF_NET_TIMEOUT);
       SHOW_I("connect-int","sec", cn.nconf.try_connect_int, DEF_NET_TRY_CON_I);