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

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Module  : drbd

Dir     : drbd/drbd


Modified Files:
      Tag: rel-0_7-branch
	drbd.h drbd_fs.c drbd_int.h drbd_receiver.c 


Log Message:
Removed the secondary_remote command.

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd.h,v
retrieving revision 1.34.2.22
retrieving revision 1.34.2.23
diff -u -3 -r1.34.2.22 -r1.34.2.23
--- drbd.h	11 Feb 2004 13:25:20 -0000	1.34.2.22
+++ drbd.h	11 Feb 2004 22:03:51 -0000	1.34.2.23
@@ -195,7 +195,6 @@
 #define DRBD_IOCTL_SET_NET_CONFIG _IOW( 'D', 0x07, struct ioctl_net_config )
 #define DRBD_IOCTL_UNCONFIG_NET  _IO ( 'D', 0x08 )
 #define DRBD_IOCTL_GET_CONFIG    _IOW( 'D', 0x0A, struct ioctl_get_config)
-#define DRBD_IOCTL_SECONDARY_REM _IOR( 'D', 0x0C, int )
 #define DRBD_IOCTL_INVALIDATE    _IO ( 'D', 0x0D )
 #define DRBD_IOCTL_INVALIDATE_REM _IO ( 'D', 0x0E )
 #define DRBD_IOCTL_SET_SYNC_CONFIG _IOW( 'D', 0x0F,struct ioctl_syncer_config)
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_fs.c,v
retrieving revision 1.28.2.72
retrieving revision 1.28.2.73
diff -u -3 -r1.28.2.72 -r1.28.2.73
--- drbd_fs.c	11 Feb 2004 13:25:20 -0000	1.28.2.72
+++ drbd_fs.c	11 Feb 2004 22:03:52 -0000	1.28.2.73
@@ -882,18 +882,6 @@
 		drbd_start_resync(mdev,SyncSource);
 		break;
 
-	case DRBD_IOCTL_SECONDARY_REM:
-		if (mdev->cstate != Connected) {
-			err = -ENXIO;
-			break;
-		}
-
-		if (mdev->o_state == Primary) {
-			drbd_send_short_cmd(mdev,BecomeSec);
-		} else err = -ESRCH;
-
-		break;
-
 	default:
 		err = -EINVAL;
 	}
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_int.h,v
retrieving revision 1.58.2.121
retrieving revision 1.58.2.122
diff -u -3 -r1.58.2.121 -r1.58.2.122
--- drbd_int.h	11 Feb 2004 13:25:20 -0000	1.58.2.121
+++ drbd_int.h	11 Feb 2004 22:03:52 -0000	1.58.2.122
@@ -267,7 +267,6 @@
 	ReportBitMap,
 	BecomeSyncTarget,
 	BecomeSyncSource,
-	BecomeSec,     // Secondary asking primary to become secondary
 	WriteHint,     // Used in protocol C to hint the secondary to hurry up
 	DataRequest,   // Used to ask for a data block
 	RSDataRequest, // Used to ask for a data block
@@ -296,7 +295,6 @@
 		[ReportBitMap]     = "ReportBitMap",
 		[BecomeSyncTarget] = "BecomeSyncTarget",
 		[BecomeSyncSource] = "BecomeSyncSource",
-		[BecomeSec]        = "BecomeSec",
 		[WriteHint]        = "WriteHint",
 		[DataRequest]      = "DataRequest",
 		[RSDataRequest]    = "RSDataRequest",
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_receiver.c,v
retrieving revision 1.97.2.108
retrieving revision 1.97.2.109
diff -u -3 -r1.97.2.108 -r1.97.2.109
--- drbd_receiver.c	11 Feb 2004 13:25:20 -0000	1.97.2.108
+++ drbd_receiver.c	11 Feb 2004 22:03:52 -0000	1.97.2.109
@@ -1412,12 +1412,6 @@
 	return TRUE; // cannot fail ?
 }
 
-STATIC int receive_BecomeSec(drbd_dev *mdev, Drbd_Header *h)
-{
-	drbd_set_state(mdev,Secondary);
-	return TRUE; // cannot fail ?
-}
-
 STATIC int receive_WriteHint(drbd_dev *mdev, Drbd_Header *h)
 {
 	drbd_kick_lo(mdev);
@@ -1439,7 +1433,6 @@
 	[PingAck]          = NULL, //receive_PingAck,
 	[BecomeSyncTarget] = receive_BecomeSyncTarget,
 	[BecomeSyncSource] = receive_BecomeSyncSource,
-	[BecomeSec]        = receive_BecomeSec,
 	[WriteHint]        = receive_WriteHint,
 	[DataRequest]      = receive_DataRequest,
 	[RSDataRequest]    = receive_DataRequest, //receive_RSDataRequest,