glusterd/mgmt_v3 locks: Generalization of the volume wide locks.

Renaming volume locks as mgmt_v3 locks

Change-Id: I2a324e2b8e1772d7b165fe96ce8ba5b902c2ed9a
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/7187
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Tested-by: Rajesh Joseph <rjoseph@redhat.com>

4 files changed, 26 insertions, 26 deletions

diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h
index e1a0b2c17..8bef906cc 100644
--- a/rpc/rpc-lib/src/protocol-common.h
+++ b/rpc/rpc-lib/src/protocol-common.h
@@ -218,12 +218,12 @@ typedef enum {
 
 enum glusterd_mgmt_v3_procnum {
         GLUSTERD_MGMT_V3_NULL,    /* 0 */
-        GLUSTERD_MGMT_V3_VOLUME_LOCK,
+        GLUSTERD_MGMT_V3_LOCK,
         GLUSTERD_MGMT_V3_PRE_VALIDATE,
         GLUSTERD_MGMT_V3_BRICK_OP,
         GLUSTERD_MGMT_V3_COMMIT,
         GLUSTERD_MGMT_V3_POST_VALIDATE,
-        GLUSTERD_MGMT_V3_VOLUME_UNLOCK,
+        GLUSTERD_MGMT_V3_UNLOCK,
         GLUSTERD_MGMT_V3_MAXVALUE,
 };
 
diff --git a/rpc/xdr/src/glusterd1-xdr.c b/rpc/xdr/src/glusterd1-xdr.c
index 5f5e76abd..6e749e258 100644
--- a/rpc/xdr/src/glusterd1-xdr.c
+++ b/rpc/xdr/src/glusterd1-xdr.c
@@ -493,7 +493,7 @@ xdr_gd1_mgmt_brick_op_rsp (XDR *xdrs, gd1_mgmt_brick_op_rsp *objp)
 }
 
 bool_t
-xdr_gd1_mgmt_v3_vol_lock_req (XDR *xdrs, gd1_mgmt_v3_vol_lock_req *objp)
+xdr_gd1_mgmt_v3_lock_req (XDR *xdrs, gd1_mgmt_v3_lock_req *objp)
 {
 	register int32_t *buf;
         buf = NULL;
@@ -512,7 +512,7 @@ xdr_gd1_mgmt_v3_vol_lock_req (XDR *xdrs, gd1_mgmt_v3_vol_lock_req *objp)
 }
 
 bool_t
-xdr_gd1_mgmt_v3_vol_lock_rsp (XDR *xdrs, gd1_mgmt_v3_vol_lock_rsp *objp)
+xdr_gd1_mgmt_v3_lock_rsp (XDR *xdrs, gd1_mgmt_v3_lock_rsp *objp)
 {
 	register int32_t *buf;
         buf = NULL;
@@ -881,7 +881,7 @@ xdr_gd1_mgmt_v3_post_val_rsp (XDR *xdrs, gd1_mgmt_v3_post_val_rsp *objp)
 }
 
 bool_t
-xdr_gd1_mgmt_v3_vol_unlock_req (XDR *xdrs, gd1_mgmt_v3_vol_unlock_req *objp)
+xdr_gd1_mgmt_v3_unlock_req (XDR *xdrs, gd1_mgmt_v3_unlock_req *objp)
 {
 	register int32_t *buf;
         buf = NULL;
@@ -900,7 +900,7 @@ xdr_gd1_mgmt_v3_vol_unlock_req (XDR *xdrs, gd1_mgmt_v3_vol_unlock_req *objp)
 }
 
 bool_t
-xdr_gd1_mgmt_v3_vol_unlock_rsp (XDR *xdrs, gd1_mgmt_v3_vol_unlock_rsp *objp)
+xdr_gd1_mgmt_v3_unlock_rsp (XDR *xdrs, gd1_mgmt_v3_unlock_rsp *objp)
 {
 	register int32_t *buf;
         buf = NULL;
diff --git a/rpc/xdr/src/glusterd1-xdr.h b/rpc/xdr/src/glusterd1-xdr.h
index 64e97a37e..5903104ed 100644
--- a/rpc/xdr/src/glusterd1-xdr.h
+++ b/rpc/xdr/src/glusterd1-xdr.h
@@ -202,7 +202,7 @@ struct gd1_mgmt_brick_op_rsp {
 };
 typedef struct gd1_mgmt_brick_op_rsp gd1_mgmt_brick_op_rsp;
 
-struct gd1_mgmt_v3_vol_lock_req {
+struct gd1_mgmt_v3_lock_req {
 	u_char uuid[16];
 	u_char txn_id[16];
 	int op;
@@ -211,9 +211,9 @@ struct gd1_mgmt_v3_vol_lock_req {
 		char *dict_val;
 	} dict;
 };
-typedef struct gd1_mgmt_v3_vol_lock_req gd1_mgmt_v3_vol_lock_req;
+typedef struct gd1_mgmt_v3_lock_req gd1_mgmt_v3_lock_req;
 
-struct gd1_mgmt_v3_vol_lock_rsp {
+struct gd1_mgmt_v3_lock_rsp {
 	u_char uuid[16];
 	u_char txn_id[16];
 	struct {
@@ -223,7 +223,7 @@ struct gd1_mgmt_v3_vol_lock_rsp {
 	int op_ret;
 	int op_errno;
 };
-typedef struct gd1_mgmt_v3_vol_lock_rsp gd1_mgmt_v3_vol_lock_rsp;
+typedef struct gd1_mgmt_v3_lock_rsp gd1_mgmt_v3_lock_rsp;
 
 struct gd1_mgmt_v3_pre_val_req {
 	u_char uuid[16];
@@ -317,7 +317,7 @@ struct gd1_mgmt_v3_post_val_rsp {
 };
 typedef struct gd1_mgmt_v3_post_val_rsp gd1_mgmt_v3_post_val_rsp;
 
-struct gd1_mgmt_v3_vol_unlock_req {
+struct gd1_mgmt_v3_unlock_req {
 	u_char uuid[16];
 	u_char txn_id[16];
 	int op;
@@ -326,9 +326,9 @@ struct gd1_mgmt_v3_vol_unlock_req {
 		char *dict_val;
 	} dict;
 };
-typedef struct gd1_mgmt_v3_vol_unlock_req gd1_mgmt_v3_vol_unlock_req;
+typedef struct gd1_mgmt_v3_unlock_req gd1_mgmt_v3_unlock_req;
 
-struct gd1_mgmt_v3_vol_unlock_rsp {
+struct gd1_mgmt_v3_unlock_rsp {
 	u_char uuid[16];
 	u_char txn_id[16];
 	struct {
@@ -338,7 +338,7 @@ struct gd1_mgmt_v3_vol_unlock_rsp {
 	int op_ret;
 	int op_errno;
 };
-typedef struct gd1_mgmt_v3_vol_unlock_rsp gd1_mgmt_v3_vol_unlock_rsp;
+typedef struct gd1_mgmt_v3_unlock_rsp gd1_mgmt_v3_unlock_rsp;
 
 /* the xdr functions */
 
@@ -362,8 +362,8 @@ extern  bool_t xdr_gd1_mgmt_friend_update (XDR *, gd1_mgmt_friend_update*);
 extern  bool_t xdr_gd1_mgmt_friend_update_rsp (XDR *, gd1_mgmt_friend_update_rsp*);
 extern  bool_t xdr_gd1_mgmt_brick_op_req (XDR *, gd1_mgmt_brick_op_req*);
 extern  bool_t xdr_gd1_mgmt_brick_op_rsp (XDR *, gd1_mgmt_brick_op_rsp*);
-extern  bool_t xdr_gd1_mgmt_v3_vol_lock_req (XDR *, gd1_mgmt_v3_vol_lock_req*);
-extern  bool_t xdr_gd1_mgmt_v3_vol_lock_rsp (XDR *, gd1_mgmt_v3_vol_lock_rsp*);
+extern  bool_t xdr_gd1_mgmt_v3_lock_req (XDR *, gd1_mgmt_v3_lock_req*);
+extern  bool_t xdr_gd1_mgmt_v3_lock_rsp (XDR *, gd1_mgmt_v3_lock_rsp*);
 extern  bool_t xdr_gd1_mgmt_v3_pre_val_req (XDR *, gd1_mgmt_v3_pre_val_req*);
 extern  bool_t xdr_gd1_mgmt_v3_pre_val_rsp (XDR *, gd1_mgmt_v3_pre_val_rsp*);
 extern  bool_t xdr_gd1_mgmt_v3_brick_op_req (XDR *, gd1_mgmt_v3_brick_op_req*);
@@ -372,8 +372,8 @@ extern  bool_t xdr_gd1_mgmt_v3_commit_req (XDR *, gd1_mgmt_v3_commit_req*);
 extern  bool_t xdr_gd1_mgmt_v3_commit_rsp (XDR *, gd1_mgmt_v3_commit_rsp*);
 extern  bool_t xdr_gd1_mgmt_v3_post_val_req (XDR *, gd1_mgmt_v3_post_val_req*);
 extern  bool_t xdr_gd1_mgmt_v3_post_val_rsp (XDR *, gd1_mgmt_v3_post_val_rsp*);
-extern  bool_t xdr_gd1_mgmt_v3_vol_unlock_req (XDR *, gd1_mgmt_v3_vol_unlock_req*);
-extern  bool_t xdr_gd1_mgmt_v3_vol_unlock_rsp (XDR *, gd1_mgmt_v3_vol_unlock_rsp*);
+extern  bool_t xdr_gd1_mgmt_v3_unlock_req (XDR *, gd1_mgmt_v3_unlock_req*);
+extern  bool_t xdr_gd1_mgmt_v3_unlock_rsp (XDR *, gd1_mgmt_v3_unlock_rsp*);
 
 #else /* K&R C */
 extern bool_t xdr_glusterd_volume_status ();
@@ -395,8 +395,8 @@ extern bool_t xdr_gd1_mgmt_friend_update ();
 extern bool_t xdr_gd1_mgmt_friend_update_rsp ();
 extern bool_t xdr_gd1_mgmt_brick_op_req ();
 extern bool_t xdr_gd1_mgmt_brick_op_rsp ();
-extern bool_t xdr_gd1_mgmt_v3_vol_lock_req ();
-extern bool_t xdr_gd1_mgmt_v3_vol_lock_rsp ();
+extern bool_t xdr_gd1_mgmt_v3_lock_req ();
+extern bool_t xdr_gd1_mgmt_v3_lock_rsp ();
 extern bool_t xdr_gd1_mgmt_v3_pre_val_req ();
 extern bool_t xdr_gd1_mgmt_v3_pre_val_rsp ();
 extern bool_t xdr_gd1_mgmt_v3_brick_op_req ();
@@ -405,8 +405,8 @@ extern bool_t xdr_gd1_mgmt_v3_commit_req ();
 extern bool_t xdr_gd1_mgmt_v3_commit_rsp ();
 extern bool_t xdr_gd1_mgmt_v3_post_val_req ();
 extern bool_t xdr_gd1_mgmt_v3_post_val_rsp ();
-extern bool_t xdr_gd1_mgmt_v3_vol_unlock_req ();
-extern bool_t xdr_gd1_mgmt_v3_vol_unlock_rsp ();
+extern bool_t xdr_gd1_mgmt_v3_unlock_req ();
+extern bool_t xdr_gd1_mgmt_v3_unlock_rsp ();
 
 #endif /* K&R C */
 
diff --git a/rpc/xdr/src/glusterd1-xdr.x b/rpc/xdr/src/glusterd1-xdr.x
index dd97cac17..fb0973af9 100644
--- a/rpc/xdr/src/glusterd1-xdr.x
+++ b/rpc/xdr/src/glusterd1-xdr.x
@@ -126,14 +126,14 @@ struct gd1_mgmt_brick_op_rsp {
         string  op_errstr<>;
 } ;
 
-struct gd1_mgmt_v3_vol_lock_req {
+struct gd1_mgmt_v3_lock_req {
         unsigned char  uuid[16];
         unsigned char  txn_id[16];
         int            op;
         opaque         dict<>;
 }  ;
 
-struct gd1_mgmt_v3_vol_lock_rsp {
+struct gd1_mgmt_v3_lock_rsp {
         unsigned char  uuid[16];
         unsigned char  txn_id[16];
         opaque         dict<>;
@@ -201,14 +201,14 @@ struct gd1_mgmt_v3_post_val_rsp {
         opaque  dict<>;
 }  ;
 
-struct gd1_mgmt_v3_vol_unlock_req {
+struct gd1_mgmt_v3_unlock_req {
         unsigned char  uuid[16];
         unsigned char  txn_id[16];
         int            op;
         opaque         dict<>;
 }  ;
 
-struct gd1_mgmt_v3_vol_unlock_rsp {
+struct gd1_mgmt_v3_unlock_rsp {
         unsigned char  uuid[16];
         unsigned char  txn_id[16];
         opaque         dict<>;