[DRBD-cvs] user by phil; Removed the secondary_remote command.

[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 drbdsetup.c 


Log Message:
Removed the secondary_remote command.

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Attic/drbdadm_main.c,v
retrieving revision 1.1.2.32
retrieving revision 1.1.2.33
diff -u -3 -r1.1.2.32 -r1.1.2.33
--- drbdadm_main.c	11 Feb 2004 13:25:20 -0000	1.1.2.32
+++ drbdadm_main.c	11 Feb 2004 22:03:52 -0000	1.1.2.33
@@ -114,7 +114,6 @@
   { "down",              adm_generic, "down"             ,1,1, "FIXME down help" },
   { "primary",           adm_generic, "primary"          ,1,1, "FIXME primary help" },
   { "secondary",         adm_generic, "secondary"        ,1,1, "FIXME secondary help" },
-  { "secondary_remote",  adm_generic, "secondary_remote" ,1,1, "FIXME secondary_remote help" },
   { "invalidate",        adm_generic, "invalidate"       ,1,1, "FIXME invalidate help" },
   { "invalidate_remote", adm_generic, "invalidate_remote",1,1, "FIXME invalidate_remote help" },
   { "resize",            adm_resize,  0                  ,1,1, "FIXME resize help" },
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/drbdsetup.c,v
retrieving revision 1.54.2.22
retrieving revision 1.54.2.23
diff -u -3 -r1.54.2.22 -r1.54.2.23
--- drbdsetup.c	11 Feb 2004 13:25:20 -0000	1.54.2.22
+++ drbdsetup.c	11 Feb 2004 22:03:52 -0000	1.54.2.23
@@ -93,7 +93,6 @@
 
 int cmd_primary(int drbd_fd,char** argv,int argc,struct option *options);
 int cmd_secondary(int drbd_fd,char** argv,int argc,struct option *options);
-int cmd_sec_rem(int drbd_fd,char** argv,int argc,struct option *options);
 int cmd_wait_sync(int drbd_fd,char** argv,int argc,struct option *options);
 int cmd_wait_connect(int drbd_fd,char** argv,int argc,struct option *options);
 int cmd_invalidate(int drbd_fd,char** argv,int argc,struct option *options);
@@ -115,7 +114,6 @@
      { "timeout-expired",no_argument,   0, 't' },
      { 0,            0,                 0, 0   } } },
   {"secondary", cmd_secondary,       0, 0, },
-  {"secondary_remote", cmd_sec_rem,  0, 0, },
   {"wait_sync", cmd_wait_sync,       0,
    (struct option[]) {
      { "time",       required_argument, 0, 't' },
@@ -735,27 +733,6 @@
 int cmd_secondary(int drbd_fd,char** argv,int argc,struct option *options)
 {
   return set_state(drbd_fd,Secondary);
-}
-
-int cmd_sec_rem(int drbd_fd,char** argv,int argc,struct option *options)
-{
-  int err;
-  err=ioctl(drbd_fd,DRBD_IOCTL_SECONDARY_REM);
-  if(err)
-    {
-      err=errno;
-      perror("ioctl() failed");
-      if(err==ENXIO)
-	fprintf(stderr,"Not connected to remote DRBD device!\n");
-
-      if(err==ESRCH)
-	{
-	  fprintf(stderr,"remote DRBD device is already in Secondary state\n");
-	  return 1;
-	}
-      return 20;
-    }
-  return 0;
 }
 
 int wait_on(int drbd_fd,char** argv,int argc,int wfct,int dwfct, int req,