[DRBD-cvs] user by phil; I just realized that read_gc and write_g...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Project : drbd
Module  : user

Dir     : drbd/user


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


Log Message:
I just realized that read_gc and write_gc were could not handle
devices with external metadata. -- Tried to fix that...
[write_gc untested]

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Attic/drbdadm_main.c,v
retrieving revision 1.1.2.37
retrieving revision 1.1.2.38
diff -u -3 -r1.1.2.37 -r1.1.2.38
--- drbdadm_main.c	7 Mar 2004 20:17:18 -0000	1.1.2.37
+++ drbdadm_main.c	29 Mar 2004 14:25:26 -0000	1.1.2.38
@@ -82,6 +82,8 @@
 static int sh_devices(struct d_resource* ,char* );
 static int sh_mod_parms(struct d_resource* ,char* );
 static int sh_ll_dev(struct d_resource* ,char* );
+static int sh_md_dev(struct d_resource* ,char* );
+static int sh_md_idx(struct d_resource* ,char* );
 
 char ss_buffer[255];
 int line=1;
@@ -121,7 +123,9 @@
   { "dump",              adm_dump,    0                  ,1,1 },
   { "sh-devices",        sh_devices,  0                  ,0,0 },
   { "sh-mod-parms",      sh_mod_parms,0                  ,0,0 },
-  { "sh-ll-dev",         sh_ll_dev,   0                  ,0,1 }
+  { "sh-ll-dev",         sh_ll_dev,   0                  ,0,1 },
+  { "sh-md-dev",         sh_md_dev,   0                  ,0,1 },
+  { "sh-md-idx",         sh_md_idx,   0                  ,0,1 }
 };
 
 #define ARRY_SIZE(A) (sizeof(A)/sizeof(A[0]))
@@ -217,6 +221,25 @@
 static int sh_ll_dev(struct d_resource* res,char* unused)
 {
   printf("%s\n",res->me->disk);
+
+  return 0;
+}
+
+static int sh_md_dev(struct d_resource* res,char* unused)
+{
+  char *r;
+
+  if(strcmp("internal",res->me->meta_disk)==0) r = res->me->disk;
+  else r = res->me->meta_disk;
+  
+  printf("%s\n",r);
+
+  return 0;
+}
+
+static int sh_md_idx(struct d_resource* res,char* unused)
+{
+  printf("%s\n",res->me->meta_index);
 
   return 0;
 }