diff options
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 284 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/protocol-common.h | 6 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/rpc-clnt.c | 4 | ||||
| -rw-r--r-- | rpc/rpc-transport/socket/src/socket.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-rebalance.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-rpc-ops.c | 80 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client-handshake.c | 16 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client-rpc-fops.c | 368 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-handshake.c | 2 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-rpc-fops.c | 212 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server.c | 12 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server.h | 2 |
12 files changed, 495 insertions, 495 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 2933b08d..a046d12a 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -74,7 +74,7 @@ char *cli_volume_status[] = {"Created", }; int32_t -gf_cli3_1_get_volume (call_frame_t *frame, xlator_t *this, +gf_cli_get_volume (call_frame_t *frame, xlator_t *this, void *data); @@ -91,7 +91,7 @@ rpc_clnt_prog_t cli_pmap_prog = { }; int -gf_cli3_1_probe_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_probe_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf1_cli_probe_rsp rsp = {0,}; @@ -208,7 +208,7 @@ out: } int -gf_cli3_1_deprobe_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_deprobe_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf1_cli_deprobe_rsp rsp = {0,}; @@ -293,7 +293,7 @@ out: } int -gf_cli3_1_list_friends_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_list_friends_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf1_cli_peer_list_rsp rsp = {0,}; @@ -458,7 +458,7 @@ cli_out_options ( char *substr, char *optstr, char *valstr) int -gf_cli3_1_get_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_get_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { int ret = -1; @@ -564,7 +564,7 @@ gf_cli3_1_get_volume_cbk (struct rpc_req *req, struct iovec *iov, xml_output: if (global_state->mode & GLUSTER_MODE_XML) { /* For GET_NEXT_VOLUME output is already begun in - * and will also end in gf_cli3_1_get_next_volume() + * and will also end in gf_cli_get_next_volume() */ if (local->get_vol.flags == GF_CLI_GET_VOLUME) { ret = cli_xml_output_vol_info_begin @@ -754,7 +754,7 @@ out: } int -gf_cli3_1_create_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_create_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -816,7 +816,7 @@ out: } int -gf_cli3_1_delete_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_delete_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -882,7 +882,7 @@ out: } int -gf_cli3_1_start_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_start_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -953,7 +953,7 @@ out: } int -gf_cli3_1_stop_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_stop_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -1023,7 +1023,7 @@ out: } int -gf_cli3_1_defrag_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_defrag_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -1256,7 +1256,7 @@ out: } int -gf_cli3_1_rename_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_rename_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -1301,7 +1301,7 @@ out: } int -gf_cli3_1_reset_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_reset_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -1349,7 +1349,7 @@ out: } int -gf_cli3_1_set_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_set_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -1413,7 +1413,7 @@ out: } int -gf_cli3_1_add_brick_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_add_brick_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -1632,7 +1632,7 @@ out: int -gf_cli3_1_remove_brick_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_remove_brick_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -1723,7 +1723,7 @@ out: int -gf_cli3_1_replace_brick_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_replace_brick_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -1891,7 +1891,7 @@ out: static int -gf_cli3_1_log_rotate_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_log_rotate_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -1942,7 +1942,7 @@ out: } static int -gf_cli3_1_sync_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_sync_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -1990,7 +1990,7 @@ out: } int32_t -gf_cli3_1_print_limit_list (char *volname, char *limit_list, +gf_cli_print_limit_list (char *volname, char *limit_list, char *op_errstr) { int64_t size = 0; @@ -2105,7 +2105,7 @@ out: } int -gf_cli3_1_quota_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_quota_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -2181,7 +2181,7 @@ gf_cli3_1_quota_cbk (struct rpc_req *req, struct iovec *iov, } #endif if (limit_list) { - gf_cli3_1_print_limit_list (volname, + gf_cli_print_limit_list (volname, limit_list, rsp.op_errstr); } else { @@ -2229,7 +2229,7 @@ out: } int -gf_cli3_1_getspec_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_getspec_rsp rsp = {0,}; @@ -2266,7 +2266,7 @@ out: } int -gf_cli3_1_pmap_b2p_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_pmap_b2p_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { pmap_port_by_brick_rsp rsp = {0,}; @@ -2297,7 +2297,7 @@ out: int32_t -gf_cli3_1_probe (call_frame_t *frame, xlator_t *this, +gf_cli_probe (call_frame_t *frame, xlator_t *this, void *data) { gf1_cli_probe_req req = {0,}; @@ -2325,7 +2325,7 @@ gf_cli3_1_probe (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_PROBE, NULL, - this, gf_cli3_1_probe_cbk, + this, gf_cli_probe_cbk, (xdrproc_t)xdr_gf1_cli_probe_req); out: @@ -2334,7 +2334,7 @@ out: } int32_t -gf_cli3_1_deprobe (call_frame_t *frame, xlator_t *this, +gf_cli_deprobe (call_frame_t *frame, xlator_t *this, void *data) { gf1_cli_deprobe_req req = {0,}; @@ -2367,7 +2367,7 @@ gf_cli3_1_deprobe (call_frame_t *frame, xlator_t *this, req.flags = flags; ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_DEPROBE, NULL, - this, gf_cli3_1_deprobe_cbk, + this, gf_cli_deprobe_cbk, (xdrproc_t)xdr_gf1_cli_deprobe_req); out: @@ -2376,7 +2376,7 @@ out: } int32_t -gf_cli3_1_list_friends (call_frame_t *frame, xlator_t *this, +gf_cli_list_friends (call_frame_t *frame, xlator_t *this, void *data) { gf1_cli_peer_list_req req = {0,}; @@ -2391,7 +2391,7 @@ gf_cli3_1_list_friends (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_LIST_FRIENDS, NULL, - this, gf_cli3_1_list_friends_cbk, + this, gf_cli_list_friends_cbk, (xdrproc_t) xdr_gf1_cli_peer_list_req); out: @@ -2400,7 +2400,7 @@ out: } int32_t -gf_cli3_1_get_next_volume (call_frame_t *frame, xlator_t *this, +gf_cli_get_next_volume (call_frame_t *frame, xlator_t *this, void *data) { @@ -2426,7 +2426,7 @@ gf_cli3_1_get_next_volume (call_frame_t *frame, xlator_t *this, } #endif - ret = gf_cli3_1_get_volume (frame, this, data); + ret = gf_cli_get_volume (frame, this, data); if (!local || !local->get_vol.volname) { @@ -2442,7 +2442,7 @@ gf_cli3_1_get_next_volume (call_frame_t *frame, xlator_t *this, ctx->volname = local->get_vol.volname; while (ctx->volname) { - ret = gf_cli3_1_get_volume (frame, this, ctx); + ret = gf_cli_get_volume (frame, this, ctx); if (ret) goto out; ctx->volname = local->get_vol.volname; @@ -2463,7 +2463,7 @@ out: } int32_t -gf_cli3_1_get_volume (call_frame_t *frame, xlator_t *this, +gf_cli_get_volume (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -2501,7 +2501,7 @@ gf_cli3_1_get_volume (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_GET_VOLUME, NULL, - this, gf_cli3_1_get_volume_cbk, + this, gf_cli_get_volume_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -2517,7 +2517,7 @@ out: int32_t -gf_cli3_1_create_volume (call_frame_t *frame, xlator_t *this, +gf_cli_create_volume (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -2549,7 +2549,7 @@ gf_cli3_1_create_volume (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_CREATE_VOLUME, NULL, - this, gf_cli3_1_create_volume_cbk, + this, gf_cli_create_volume_cbk, (xdrproc_t) xdr_gf_cli_req); @@ -2568,7 +2568,7 @@ out: } int32_t -gf_cli3_1_delete_volume (call_frame_t *frame, xlator_t *this, +gf_cli_delete_volume (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -2604,7 +2604,7 @@ gf_cli3_1_delete_volume (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_DELETE_VOLUME, NULL, - this, gf_cli3_1_delete_volume_cbk, + this, gf_cli_delete_volume_cbk, (xdrproc_t)xdr_gf_cli_req); out: @@ -2618,7 +2618,7 @@ out: } int32_t -gf_cli3_1_start_volume (call_frame_t *frame, xlator_t *this, +gf_cli_start_volume (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -2650,7 +2650,7 @@ gf_cli3_1_start_volume (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_START_VOLUME, NULL, - this, gf_cli3_1_start_volume_cbk, + this, gf_cli_start_volume_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -2660,7 +2660,7 @@ out: } int32_t -gf_cli3_1_stop_volume (call_frame_t *frame, xlator_t *this, +gf_cli_stop_volume (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -2692,7 +2692,7 @@ gf_cli3_1_stop_volume (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_STOP_VOLUME, NULL, - this, gf_cli3_1_stop_volume_cbk, + this, gf_cli_stop_volume_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -2702,7 +2702,7 @@ out: } int32_t -gf_cli3_1_defrag_volume (call_frame_t *frame, xlator_t *this, +gf_cli_defrag_volume (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -2794,7 +2794,7 @@ done: ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_DEFRAG_VOLUME, NULL, - this, gf_cli3_1_defrag_volume_cbk, + this, gf_cli_defrag_volume_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -2807,7 +2807,7 @@ out: } int32_t -gf_cli3_1_rename_volume (call_frame_t *frame, xlator_t *this, +gf_cli_rename_volume (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -2833,7 +2833,7 @@ gf_cli3_1_rename_volume (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_RENAME_VOLUME, NULL, - this, gf_cli3_1_rename_volume_cbk, + this, gf_cli_rename_volume_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -2843,7 +2843,7 @@ out: } int32_t -gf_cli3_1_reset_volume (call_frame_t *frame, xlator_t *this, +gf_cli_reset_volume (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -2867,7 +2867,7 @@ gf_cli3_1_reset_volume (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_RESET_VOLUME, NULL, - this, gf_cli3_1_reset_volume_cbk, + this, gf_cli_reset_volume_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -2877,7 +2877,7 @@ out: } int32_t -gf_cli3_1_set_volume (call_frame_t *frame, xlator_t *this, +gf_cli_set_volume (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -2901,7 +2901,7 @@ gf_cli3_1_set_volume (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_SET_VOLUME, NULL, - this, gf_cli3_1_set_volume_cbk, + this, gf_cli_set_volume_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -2911,7 +2911,7 @@ out: } int32_t -gf_cli3_1_add_brick (call_frame_t *frame, xlator_t *this, +gf_cli_add_brick (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -2947,7 +2947,7 @@ gf_cli3_1_add_brick (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_ADD_BRICK, NULL, - this, gf_cli3_1_add_brick_cbk, + this, gf_cli_add_brick_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -2961,7 +2961,7 @@ out: } int32_t -gf_cli3_1_remove_brick (call_frame_t *frame, xlator_t *this, +gf_cli_remove_brick (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}};; @@ -3014,7 +3014,7 @@ gf_cli3_1_remove_brick (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_REMOVE_BRICK, NULL, - this, gf_cli3_1_remove_brick_cbk, + this, gf_cli_remove_brick_cbk, (xdrproc_t) xdr_gf_cli_req); } else { /* Need rebalance status to e sent :-) */ @@ -3076,7 +3076,7 @@ out: } int32_t -gf_cli3_1_replace_brick (call_frame_t *frame, xlator_t *this, +gf_cli_replace_brick (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -3149,7 +3149,7 @@ gf_cli3_1_replace_brick (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_REPLACE_BRICK, NULL, - this, gf_cli3_1_replace_brick_cbk, + this, gf_cli_replace_brick_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -3164,7 +3164,7 @@ out: int32_t -gf_cli3_1_log_rotate (call_frame_t *frame, xlator_t *this, +gf_cli_log_rotate (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -3188,7 +3188,7 @@ gf_cli3_1_log_rotate (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_LOG_ROTATE, NULL, - this, gf_cli3_1_log_rotate_cbk, + this, gf_cli_log_rotate_cbk, (xdrproc_t) xdr_gf_cli_req); @@ -3201,7 +3201,7 @@ out: } int32_t -gf_cli3_1_sync_volume (call_frame_t *frame, xlator_t *this, +gf_cli_sync_volume (call_frame_t *frame, xlator_t *this, void *data) { int ret = 0; @@ -3224,7 +3224,7 @@ gf_cli3_1_sync_volume (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_SYNC_VOLUME, - NULL, this, gf_cli3_1_sync_volume_cbk, + NULL, this, gf_cli_sync_volume_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -3236,7 +3236,7 @@ out: } int32_t -gf_cli3_1_getspec (call_frame_t *frame, xlator_t *this, +gf_cli_getspec (call_frame_t *frame, xlator_t *this, void *data) { gf_getspec_req req = {0,}; @@ -3256,7 +3256,7 @@ gf_cli3_1_getspec (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, &cli_handshake_prog, GF_HNDSK_GETSPEC, NULL, - this, gf_cli3_1_getspec_cbk, + this, gf_cli_getspec_cbk, (xdrproc_t) xdr_gf_getspec_req); out: @@ -3266,7 +3266,7 @@ out: } int32_t -gf_cli3_1_quota (call_frame_t *frame, xlator_t *this, +gf_cli_quota (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -3290,7 +3290,7 @@ gf_cli3_1_quota (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_QUOTA, NULL, - this, gf_cli3_1_quota_cbk, + this, gf_cli_quota_cbk, (xdrproc_t) xdr_gf_cli_req); GF_FREE (req.dict.dict_val); @@ -3299,7 +3299,7 @@ out: } int32_t -gf_cli3_1_pmap_b2p (call_frame_t *frame, xlator_t *this, void *data) +gf_cli_pmap_b2p (call_frame_t *frame, xlator_t *this, void *data) { pmap_port_by_brick_req req = {0,}; int ret = 0; @@ -3318,7 +3318,7 @@ gf_cli3_1_pmap_b2p (call_frame_t *frame, xlator_t *this, void *data) ret = cli_cmd_submit (&req, frame, &cli_pmap_prog, GF_PMAP_PORTBYBRICK, NULL, - this, gf_cli3_1_pmap_b2p_cbk, + this, gf_cli_pmap_b2p_cbk, (xdrproc_t) xdr_pmap_port_by_brick_req); out: @@ -3328,7 +3328,7 @@ out: } static int -gf_cli3_1_fsm_log_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_fsm_log_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf1_cli_fsm_log_rsp rsp = {0,}; @@ -3418,7 +3418,7 @@ out: } int32_t -gf_cli3_1_fsm_log (call_frame_t *frame, xlator_t *this, void *data) +gf_cli_fsm_log (call_frame_t *frame, xlator_t *this, void *data) { int ret = -1; gf1_cli_fsm_log_req req = {0,}; @@ -3432,7 +3432,7 @@ gf_cli3_1_fsm_log (call_frame_t *frame, xlator_t *this, void *data) req.name = data; ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_FSM_LOG, NULL, - this, gf_cli3_1_fsm_log_cbk, + this, gf_cli_fsm_log_cbk, (xdrproc_t) xdr_gf1_cli_fsm_log_req); out: @@ -3442,7 +3442,7 @@ out: } int -gf_cli3_1_gsync_config_command (dict_t *dict) +gf_cli_gsync_config_command (dict_t *dict) { runner_t runner = {0,}; char *subop = NULL; @@ -3482,7 +3482,7 @@ gf_cli3_1_gsync_config_command (dict_t *dict) } int -gf_cli3_1_gsync_out_status (dict_t *dict) +gf_cli_gsync_out_status (dict_t *dict) { int gsync_count = 0; int i = 0; @@ -3539,7 +3539,7 @@ gf_cli3_1_gsync_out_status (dict_t *dict) } int -gf_cli3_1_gsync_set_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_gsync_set_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { int ret = -1; @@ -3620,11 +3620,11 @@ gf_cli3_1_gsync_set_cbk (struct rpc_req *req, struct iovec *iov, break; case GF_GSYNC_OPTION_TYPE_CONFIG: - ret = gf_cli3_1_gsync_config_command (dict); + ret = gf_cli_gsync_config_command (dict); break; case GF_GSYNC_OPTION_TYPE_STATUS: - ret = gf_cli3_1_gsync_out_status (dict); + ret = gf_cli_gsync_out_status (dict); goto out; default: cli_out (GEOREP" command executed successfully"); @@ -3641,7 +3641,7 @@ out: } int32_t -gf_cli3_1_gsync_set (call_frame_t *frame, xlator_t *this, +gf_cli_gsync_set (call_frame_t *frame, xlator_t *this, void *data) { int ret = 0; @@ -3666,7 +3666,7 @@ gf_cli3_1_gsync_set (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_GSYNC_SET, NULL, - this, gf_cli3_1_gsync_set_cbk, + this, gf_cli_gsync_set_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -3862,7 +3862,7 @@ cmd_profile_volume_brick_out (dict_t *dict, int count, int interval) } int32_t -gf_cli3_1_profile_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_profile_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -4012,7 +4012,7 @@ out: } int32_t -gf_cli3_1_profile_volume (call_frame_t *frame, xlator_t *this, void *data) +gf_cli_profile_volume (call_frame_t *frame, xlator_t *this, void *data) { int ret = -1; gf_cli_req req = {{0,}}; @@ -4039,7 +4039,7 @@ gf_cli3_1_profile_volume (call_frame_t *frame, xlator_t *this, void *data) ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_PROFILE_VOLUME, NULL, - this, gf_cli3_1_profile_volume_cbk, + this, gf_cli_profile_volume_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -4051,7 +4051,7 @@ out: } int32_t -gf_cli3_1_top_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_top_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -4288,7 +4288,7 @@ out: } int32_t -gf_cli3_1_top_volume (call_frame_t *frame, xlator_t *this, void *data) +gf_cli_top_volume (call_frame_t *frame, xlator_t *this, void *data) { int ret = -1; gf_cli_req req = {{0,}}; @@ -4314,7 +4314,7 @@ gf_cli3_1_top_volume (call_frame_t *frame, xlator_t *this, void *data) ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_PROFILE_VOLUME, NULL, - this, gf_cli3_1_top_volume_cbk, + this, gf_cli_top_volume_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -4326,7 +4326,7 @@ out: int -gf_cli3_1_getwd_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_getwd_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf1_cli_getwd_rsp rsp = {0,}; @@ -4354,7 +4354,7 @@ out: } int32_t -gf_cli3_1_getwd (call_frame_t *frame, xlator_t *this, void *data) +gf_cli_getwd (call_frame_t *frame, xlator_t *this, void *data) { int ret = -1; gf1_cli_getwd_req req = {0,}; @@ -4367,7 +4367,7 @@ gf_cli3_1_getwd (call_frame_t *frame, xlator_t *this, void *data) ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_GETWD, NULL, - this, gf_cli3_1_getwd_cbk, + this, gf_cli_getwd_cbk, (xdrproc_t) xdr_gf1_cli_getwd_req); out: @@ -5355,7 +5355,7 @@ out: } static int -gf_cli3_1_status_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_status_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { int ret = -1; @@ -5585,7 +5585,7 @@ out: } int32_t -gf_cli3_1_status_volume (call_frame_t *frame, xlator_t *this, +gf_cli_status_volume (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -5607,7 +5607,7 @@ gf_cli3_1_status_volume (call_frame_t *frame, xlator_t *this, } ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_STATUS_VOLUME, NULL, - this, gf_cli3_1_status_cbk, + this, gf_cli_status_cbk, (xdrproc_t)xdr_gf_cli_req); out: @@ -5642,7 +5642,7 @@ gf_cli_status_volume_all (call_frame_t *frame, xlator_t *this, void *data) frame->local = local; local->all = _gf_true; - ret = gf_cli3_1_status_volume (frame, this, data); + ret = gf_cli_status_volume (frame, this, data); if (ret) goto out; @@ -5684,7 +5684,7 @@ gf_cli_status_volume_all (call_frame_t *frame, xlator_t *this, void *data) if (ret) goto out; - ret = gf_cli3_1_status_volume (frame, this, dict); + ret = gf_cli_status_volume (frame, this, dict); if (ret) goto out; @@ -5702,7 +5702,7 @@ gf_cli_status_volume_all (call_frame_t *frame, xlator_t *this, void *data) } static int -gf_cli3_1_mount_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_mount_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf1_cli_mount_rsp rsp = {0,}; @@ -5736,7 +5736,7 @@ out: } int32_t -gf_cli3_1_mount (call_frame_t *frame, xlator_t *this, void *data) +gf_cli_mount (call_frame_t *frame, xlator_t *this, void *data) { gf1_cli_mount_req req = {0,}; int ret = -1; @@ -5760,7 +5760,7 @@ gf_cli3_1_mount (call_frame_t *frame, xlator_t *this, void *data) ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_MOUNT, NULL, - this, gf_cli3_1_mount_cbk, + this, gf_cli_mount_cbk, (xdrproc_t)xdr_gf1_cli_mount_req); out: @@ -5769,7 +5769,7 @@ out: } static int -gf_cli3_1_umount_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_umount_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf1_cli_umount_rsp rsp = {0,}; @@ -5800,7 +5800,7 @@ out: } int32_t -gf_cli3_1_umount (call_frame_t *frame, xlator_t *this, void *data) +gf_cli_umount (call_frame_t *frame, xlator_t *this, void *data) { gf1_cli_umount_req req = {0,}; int ret = -1; @@ -5822,7 +5822,7 @@ gf_cli3_1_umount (call_frame_t *frame, xlator_t *this, void *data) ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_UMOUNT, NULL, - this, gf_cli3_1_umount_cbk, + this, gf_cli_umount_cbk, (xdrproc_t)xdr_gf1_cli_umount_req); out: @@ -5884,7 +5884,7 @@ out: } int -gf_cli3_1_heal_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_heal_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -6010,7 +6010,7 @@ out: } int32_t -gf_cli3_1_heal_volume (call_frame_t *frame, xlator_t *this, +gf_cli_heal_volume (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -6042,7 +6042,7 @@ gf_cli3_1_heal_volume (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_HEAL_VOLUME, NULL, - this, gf_cli3_1_heal_volume_cbk, + this, gf_cli_heal_volume_cbk, (xdrproc_t) xdr_gf_cli_req); out: @@ -6055,7 +6055,7 @@ out: } int32_t -gf_cli3_1_statedump_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_statedump_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -6099,7 +6099,7 @@ out: } int32_t -gf_cli3_1_statedump_volume (call_frame_t *frame, xlator_t *this, +gf_cli_statedump_volume (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -6122,7 +6122,7 @@ gf_cli3_1_statedump_volume (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_STATEDUMP_VOLUME, NULL, - this, gf_cli3_1_statedump_volume_cbk, + this, gf_cli_statedump_volume_cbk, (xdrproc_t)xdr_gf_cli_req); out: @@ -6136,7 +6136,7 @@ out: } int32_t -gf_cli3_1_list_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_list_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { int ret = -1; @@ -6207,7 +6207,7 @@ out: } int32_t -gf_cli3_1_list_volume (call_frame_t *frame, xlator_t *this, void *data) +gf_cli_list_volume (call_frame_t *frame, xlator_t *this, void *data) { int ret = -1; gf_cli_req req = {{0,}}; @@ -6217,7 +6217,7 @@ gf_cli3_1_list_volume (call_frame_t *frame, xlator_t *this, void *data) ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_LIST_VOLUME, NULL, - this, gf_cli3_1_list_volume_cbk, + this, gf_cli_list_volume_cbk, (xdrproc_t)xdr_gf_cli_req); out: @@ -6226,7 +6226,7 @@ out: } int32_t -gf_cli3_1_clearlocks_volume_cbk (struct rpc_req *req, struct iovec *iov, +gf_cli_clearlocks_volume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gf_cli_rsp rsp = {0,}; @@ -6300,7 +6300,7 @@ out: } int32_t -gf_cli3_1_clearlocks_volume (call_frame_t *frame, xlator_t *this, +gf_cli_clearlocks_volume (call_frame_t *frame, xlator_t *this, void *data) { gf_cli_req req = {{0,}}; @@ -6323,7 +6323,7 @@ gf_cli3_1_clearlocks_volume (call_frame_t *frame, xlator_t *this, ret = cli_cmd_submit (&req, frame, cli_rpc_prog, GLUSTER_CLI_CLRLOCKS_VOLUME, NULL, - this, gf_cli3_1_clearlocks_volume_cbk, + this, gf_cli_clearlocks_volume_cbk, (xdrproc_t)xdr_gf_cli_req); out: @@ -6338,40 +6338,40 @@ out: struct rpc_clnt_procedure gluster_cli_actors[GLUSTER_CLI_MAXVALUE] = { [GLUSTER_CLI_NULL] = {"NULL", NULL }, - [GLUSTER_CLI_PROBE] = {"PROBE_QUERY", gf_cli3_1_probe}, - [GLUSTER_CLI_DEPROBE] = {"DEPROBE_QUERY", gf_cli3_1_deprobe}, - [GLUSTER_CLI_LIST_FRIENDS] = {"LIST_FRIENDS", gf_cli3_1_list_friends}, - [GLUSTER_CLI_CREATE_VOLUME] = {"CREATE_VOLUME", gf_cli3_1_create_volume}, - [GLUSTER_CLI_DELETE_VOLUME] = {"DELETE_VOLUME", gf_cli3_1_delete_volume}, - [GLUSTER_CLI_START_VOLUME] = {"START_VOLUME", gf_cli3_1_start_volume}, - [GLUSTER_CLI_STOP_VOLUME] = {"STOP_VOLUME", gf_cli3_1_stop_volume}, - [GLUSTER_CLI_RENAME_VOLUME] = {"RENAME_VOLUME", gf_cli3_1_rename_volume}, - [GLUSTER_CLI_DEFRAG_VOLUME] = {"DEFRAG_VOLUME", gf_cli3_1_defrag_volume}, - [GLUSTER_CLI_GET_VOLUME] = {"GET_VOLUME", gf_cli3_1_get_volume}, - [GLUSTER_CLI_GET_NEXT_VOLUME] = {"GET_NEXT_VOLUME", gf_cli3_1_get_next_volume}, - [GLUSTER_CLI_SET_VOLUME] = {"SET_VOLUME", gf_cli3_1_set_volume}, - [GLUSTER_CLI_ADD_BRICK] = {"ADD_BRICK", gf_cli3_1_add_brick}, - [GLUSTER_CLI_REMOVE_BRICK] = {"REMOVE_BRICK", gf_cli3_1_remove_brick}, - [GLUSTER_CLI_REPLACE_BRICK] = {"REPLACE_BRICK", gf_cli3_1_replace_brick}, - [GLUSTER_CLI_LOG_ROTATE] = {"LOG ROTATE", gf_cli3_1_log_rotate}, - [GLUSTER_CLI_GETSPEC] = {"GETSPEC", gf_cli3_1_getspec}, - [GLUSTER_CLI_PMAP_PORTBYBRICK] = {"PMAP PORTBYBRICK", gf_cli3_1_pmap_b2p}, - [GLUSTER_CLI_SYNC_VOLUME] = {"SYNC_VOLUME", gf_cli3_1_sync_volume}, - [GLUSTER_CLI_RESET_VOLUME] = {"RESET_VOLUME", gf_cli3_1_reset_volume}, - [GLUSTER_CLI_FSM_LOG] = {"FSM_LOG", gf_cli3_1_fsm_log}, - [GLUSTER_CLI_GSYNC_SET] = {"GSYNC_SET", gf_cli3_1_gsync_set}, - [GLUSTER_CLI_PROFILE_VOLUME] = {"PROFILE_VOLUME", gf_cli3_1_profile_volume}, - [GLUSTER_CLI_QUOTA] = {"QUOTA", gf_cli3_1_quota}, - [GLUSTER_CLI_TOP_VOLUME] = {"TOP_VOLUME", gf_cli3_1_top_volume}, - [GLUSTER_CLI_GETWD] = {"GETWD", gf_cli3_1_getwd}, - [GLUSTER_CLI_STATUS_VOLUME] = {"STATUS_VOLUME", gf_cli3_1_status_volume}, + [GLUSTER_CLI_PROBE] = {"PROBE_QUERY", gf_cli_probe}, + [GLUSTER_CLI_DEPROBE] = {"DEPROBE_QUERY", gf_cli_deprobe}, + [GLUSTER_CLI_LIST_FRIENDS] = {"LIST_FRIENDS", gf_cli_list_friends}, + [GLUSTER_CLI_CREATE_VOLUME] = {"CREATE_VOLUME", gf_cli_create_volume}, + [GLUSTER_CLI_DELETE_VOLUME] = {"DELETE_VOLUME", gf_cli_delete_volume}, + [GLUSTER_CLI_START_VOLUME] = {"START_VOLUME", gf_cli_start_volume}, + [GLUSTER_CLI_STOP_VOLUME] = {"STOP_VOLUME", gf_cli_stop_volume}, + [GLUSTER_CLI_RENAME_VOLUME] = {"RENAME_VOLUME", gf_cli_rename_volume}, + [GLUSTER_CLI_DEFRAG_VOLUME] = {"DEFRAG_VOLUME", gf_cli_defrag_volume}, + [GLUSTER_CLI_GET_VOLUME] = {"GET_VOLUME", gf_cli_get_volume}, + [GLUSTER_CLI_GET_NEXT_VOLUME] = {"GET_NEXT_VOLUME", gf_cli_get_next_volume}, + [GLUSTER_CLI_SET_VOLUME] = {"SET_VOLUME", gf_cli_set_volume}, + [GLUSTER_CLI_ADD_BRICK] = {"ADD_BRICK", gf_cli_add_brick}, + [GLUSTER_CLI_REMOVE_BRICK] = {"REMOVE_BRICK", gf_cli_remove_brick}, + [GLUSTER_CLI_REPLACE_BRICK] = {"REPLACE_BRICK", gf_cli_replace_brick}, + [GLUSTER_CLI_LOG_ROTATE] = {"LOG ROTATE", gf_cli_log_rotate}, + [GLUSTER_CLI_GETSPEC] = {"GETSPEC", gf_cli_getspec}, + [GLUSTER_CLI_PMAP_PORTBYBRICK] = {"PMAP PORTBYBRICK", gf_cli_pmap_b2p}, + [GLUSTER_CLI_SYNC_VOLUME] = {"SYNC_VOLUME", gf_cli_sync_volume}, + [GLUSTER_CLI_RESET_VOLUME] = {"RESET_VOLUME", gf_cli_reset_volume}, + [GLUSTER_CLI_FSM_LOG] = {"FSM_LOG", gf_cli_fsm_log}, + [GLUSTER_CLI_GSYNC_SET] = {"GSYNC_SET", gf_cli_gsync_set}, + [GLUSTER_CLI_PROFILE_VOLUME] = {"PROFILE_VOLUME", gf_cli_profile_volume}, + [GLUSTER_CLI_QUOTA] = {"QUOTA", gf_cli_quota}, + [GLUSTER_CLI_TOP_VOLUME] = {"TOP_VOLUME", gf_cli_top_volume}, + [GLUSTER_CLI_GETWD] = {"GETWD", gf_cli_getwd}, + [GLUSTER_CLI_STATUS_VOLUME] = {"STATUS_VOLUME", gf_cli_status_volume}, [GLUSTER_CLI_STATUS_ALL] = {"STATUS_ALL", gf_cli_status_volume_all}, - [GLUSTER_CLI_MOUNT] = {"MOUNT", gf_cli3_1_mount}, - [GLUSTER_CLI_UMOUNT] = {"UMOUNT", gf_cli3_1_umount}, - [GLUSTER_CLI_HEAL_VOLUME] = {"HEAL_VOLUME", gf_cli3_1_heal_volume}, - [GLUSTER_CLI_STATEDUMP_VOLUME] = {"STATEDUMP_VOLUME", gf_cli3_1_statedump_volume}, - [GLUSTER_CLI_LIST_VOLUME] = {"LIST_VOLUME", gf_cli3_1_list_volume}, - [GLUSTER_CLI_CLRLOCKS_VOLUME] = {"CLEARLOCKS_VOLUME", gf_cli3_1_clearlocks_volume}, + [GLUSTER_CLI_MOUNT] = {"MOUNT", gf_cli_mount}, + [GLUSTER_CLI_UMOUNT] = {"UMOUNT", gf_cli_umount}, + [GLUSTER_CLI_HEAL_VOLUME] = {"HEAL_VOLUME", gf_cli_heal_volume}, + [GLUSTER_CLI_STATEDUMP_VOLUME] = {"STATEDUMP_VOLUME", gf_cli_statedump_volume}, + [GLUSTER_CLI_LIST_VOLUME] = {"LIST_VOLUME", gf_cli_list_volume}, + [GLUSTER_CLI_CLRLOCKS_VOLUME] = {"CLEARLOCKS_VOLUME", gf_cli_clearlocks_volume}, }; struct rpc_clnt_program cli_prog = { diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h index c6b86594..603bda58 100644 --- a/rpc/rpc-lib/src/protocol-common.h +++ b/rpc/rpc-lib/src/protocol-common.h @@ -204,9 +204,9 @@ typedef enum { #define GLUSTER_CBK_PROGRAM 52743234 /* Completely random */ #define GLUSTER_CBK_VERSION 1 /* 0.0.1 */ -#define GLUSTER3_1_FOP_PROGRAM 1298437 /* Completely random */ -#define GLUSTER3_1_FOP_VERSION 330 /* 3.3.0 */ -#define GLUSTER3_1_FOP_PROCCNT GFS3_OP_MAXVALUE +#define GLUSTER_FOP_PROGRAM 1298437 /* Completely random */ +#define GLUSTER_FOP_VERSION 330 /* 3.3.0 */ +#define GLUSTER_FOP_PROCCNT GFS3_OP_MAXVALUE /* Second version */ #define GD_MGMT_PROGRAM 1238433 /* Completely random */ diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c index 5bd8480b..9a65f09c 100644 --- a/rpc/rpc-lib/src/rpc-clnt.c +++ b/rpc/rpc-lib/src/rpc-clnt.c @@ -66,8 +66,8 @@ _is_lock_fop (struct saved_frame *sframe) { int fop = 0; - if (SFRAME_GET_PROGNUM (sframe) == GLUSTER3_1_FOP_PROGRAM && - SFRAME_GET_PROGVER (sframe) == GLUSTER3_1_FOP_VERSION) + if (SFRAME_GET_PROGNUM (sframe) == GLUSTER_FOP_PROGRAM && + SFRAME_GET_PROGVER (sframe) == GLUSTER_FOP_VERSION) fop = SFRAME_GET_PROCNUM (sframe); return ((fop == GFS3_OP_LK) || diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index 0fee6cb4..655e806a 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -1411,7 +1411,7 @@ __socket_read_reply (rpc_transport_t *this) } } - if ((request_info->prognum == GLUSTER3_1_FOP_PROGRAM) + if ((request_info->prognum == GLUSTER_FOP_PROGRAM) && (request_info->procnum == GF_FOP_READ)) { if (map_xid && request_info->rsp.rsp_payload_count != 0) { priv->incoming.iobref diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index 67c96797..e57e687c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -48,7 +48,7 @@ #include "xdr-generic.h" int32_t -glusterd3_1_brick_op_cbk (struct rpc_req *req, struct iovec *iov, +glusterd_brick_op_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe); void diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c index 774d067b..f5863117 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c @@ -192,7 +192,7 @@ glusterd_op_send_cli_response (glusterd_op_t op, int32_t op_ret, } int -glusterd3_1_probe_cbk (struct rpc_req *req, struct iovec *iov, +glusterd_probe_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gd1_mgmt_probe_rsp rsp = {{0},}; @@ -295,7 +295,7 @@ out: } int -glusterd3_1_friend_add_cbk (struct rpc_req * req, struct iovec *iov, +glusterd_friend_add_cbk (struct rpc_req * req, struct iovec *iov, int count, void *myframe) { gd1_mgmt_friend_rsp rsp = {{0},}; @@ -389,7 +389,7 @@ out: } int -glusterd3_1_friend_remove_cbk (struct rpc_req * req, struct iovec *iov, +glusterd_friend_remove_cbk (struct rpc_req * req, struct iovec *iov, int count, void *myframe) { gd1_mgmt_friend_rsp rsp = {{0},}; @@ -484,7 +484,7 @@ respond: } int32_t -glusterd3_1_friend_update_cbk (struct rpc_req *req, struct iovec *iov, +glusterd_friend_update_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { int ret = -1; @@ -517,7 +517,7 @@ out: } int32_t -glusterd3_1_cluster_lock_cbk (struct rpc_req *req, struct iovec *iov, +glusterd_cluster_lock_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gd1_mgmt_cluster_lock_rsp rsp = {{0},}; @@ -575,7 +575,7 @@ out: } int32_t -glusterd3_1_cluster_unlock_cbk (struct rpc_req *req, struct iovec *iov, +glusterd_cluster_unlock_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gd1_mgmt_cluster_lock_rsp rsp = {{0},}; @@ -823,7 +823,7 @@ out: } int32_t -glusterd3_1_stage_op_cbk (struct rpc_req *req, struct iovec *iov, +glusterd_stage_op_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gd1_mgmt_stage_op_rsp rsp = {{0},}; @@ -1273,7 +1273,7 @@ out: } int32_t -glusterd3_1_commit_op_cbk (struct rpc_req *req, struct iovec *iov, +glusterd_commit_op_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gd1_mgmt_commit_op_rsp rsp = {{0},}; @@ -1431,8 +1431,8 @@ out: int32_t -glusterd3_1_probe (call_frame_t *frame, xlator_t *this, - void *data) +glusterd_rpc_probe (call_frame_t *frame, xlator_t *this, + void *data) { gd1_mgmt_probe_req req = {{0},}; int ret = 0; @@ -1468,7 +1468,7 @@ glusterd3_1_probe (call_frame_t *frame, xlator_t *this, ret = glusterd_submit_request (peerinfo->rpc, &req, frame, peerinfo->peer, GLUSTERD_PROBE_QUERY, - NULL, this, glusterd3_1_probe_cbk, + NULL, this, glusterd_probe_cbk, (xdrproc_t)xdr_gd1_mgmt_probe_req); out: @@ -1480,8 +1480,8 @@ out: int32_t -glusterd3_1_friend_add (call_frame_t *frame, xlator_t *this, - void *data) +glusterd_rpc_friend_add (call_frame_t *frame, xlator_t *this, + void *data) { gd1_mgmt_friend_req req = {{0},}; int ret = 0; @@ -1518,7 +1518,7 @@ glusterd3_1_friend_add (call_frame_t *frame, xlator_t *this, ret = glusterd_submit_request (peerinfo->rpc, &req, frame, peerinfo->peer, GLUSTERD_FRIEND_ADD, - NULL, this, glusterd3_1_friend_add_cbk, + NULL, this, glusterd_friend_add_cbk, (xdrproc_t)xdr_gd1_mgmt_friend_req); @@ -1534,8 +1534,8 @@ out: } int32_t -glusterd3_1_friend_remove (call_frame_t *frame, xlator_t *this, - void *data) +glusterd_rpc_friend_remove (call_frame_t *frame, xlator_t *this, + void *data) { gd1_mgmt_friend_req req = {{0},}; int ret = 0; @@ -1560,7 +1560,7 @@ glusterd3_1_friend_remove (call_frame_t *frame, xlator_t *this, req.port = peerinfo->port; ret = glusterd_submit_request (peerinfo->rpc, &req, frame, peerinfo->peer, GLUSTERD_FRIEND_REMOVE, NULL, - this, glusterd3_1_friend_remove_cbk, + this, glusterd_friend_remove_cbk, (xdrproc_t)xdr_gd1_mgmt_friend_req); out: @@ -1570,8 +1570,8 @@ out: int32_t -glusterd3_1_friend_update (call_frame_t *frame, xlator_t *this, - void *data) +glusterd_rpc_friend_update (call_frame_t *frame, xlator_t *this, + void *data) { gd1_mgmt_friend_update req = {{0},}; int ret = 0; @@ -1602,7 +1602,7 @@ glusterd3_1_friend_update (call_frame_t *frame, xlator_t *this, ret = glusterd_submit_request (peerinfo->rpc, &req, dummy_frame, peerinfo->peer, GLUSTERD_FRIEND_UPDATE, NULL, - this, glusterd3_1_friend_update_cbk, + this, glusterd_friend_update_cbk, (xdrproc_t)xdr_gd1_mgmt_friend_update); out: @@ -1614,7 +1614,7 @@ out: } int32_t -glusterd3_1_cluster_lock (call_frame_t *frame, xlator_t *this, +glusterd_cluster_lock (call_frame_t *frame, xlator_t *this, void *data) { gd1_mgmt_cluster_lock_req req = {{0},}; @@ -1640,7 +1640,7 @@ glusterd3_1_cluster_lock (call_frame_t *frame, xlator_t *this, ret = glusterd_submit_request (peerinfo->rpc, &req, dummy_frame, peerinfo->mgmt, GLUSTERD_MGMT_CLUSTER_LOCK, NULL, - this, glusterd3_1_cluster_lock_cbk, + this, glusterd_cluster_lock_cbk, (xdrproc_t)xdr_gd1_mgmt_cluster_lock_req); out: gf_log ("glusterd", GF_LOG_DEBUG, "Returning %d", ret); @@ -1648,7 +1648,7 @@ out: } int32_t -glusterd3_1_cluster_unlock (call_frame_t *frame, xlator_t *this, +glusterd_cluster_unlock (call_frame_t *frame, xlator_t *this, void *data) { gd1_mgmt_cluster_lock_req req = {{0},}; @@ -1674,7 +1674,7 @@ glusterd3_1_cluster_unlock (call_frame_t *frame, xlator_t *this, ret = glusterd_submit_request (peerinfo->rpc, &req, dummy_frame, peerinfo->mgmt, GLUSTERD_MGMT_CLUSTER_UNLOCK, NULL, - this, glusterd3_1_cluster_unlock_cbk, + this, glusterd_cluster_unlock_cbk, (xdrproc_t)xdr_gd1_mgmt_cluster_unlock_req); out: gf_log ("glusterd", GF_LOG_DEBUG, "Returning %d", ret); @@ -1682,7 +1682,7 @@ out: } int32_t -glusterd3_1_stage_op (call_frame_t *frame, xlator_t *this, +glusterd_stage_op (call_frame_t *frame, xlator_t *this, void *data) { gd1_mgmt_stage_op_req req = {{0,},}; @@ -1725,7 +1725,7 @@ glusterd3_1_stage_op (call_frame_t *frame, xlator_t *this, ret = glusterd_submit_request (peerinfo->rpc, &req, dummy_frame, peerinfo->mgmt, GLUSTERD_MGMT_STAGE_OP, NULL, - this, glusterd3_1_stage_op_cbk, + this, glusterd_stage_op_cbk, (xdrproc_t)xdr_gd1_mgmt_stage_op_req); out: @@ -1737,7 +1737,7 @@ out: } int32_t -glusterd3_1_commit_op (call_frame_t *frame, xlator_t *this, +glusterd_commit_op (call_frame_t *frame, xlator_t *this, void *data) { gd1_mgmt_commit_op_req req = {{0,},}; @@ -1778,7 +1778,7 @@ glusterd3_1_commit_op (call_frame_t *frame, xlator_t *this, ret = glusterd_submit_request (peerinfo->rpc, &req, dummy_frame, peerinfo->mgmt, GLUSTERD_MGMT_COMMIT_OP, NULL, - this, glusterd3_1_commit_op_cbk, + this, glusterd_commit_op_cbk, (xdrproc_t)xdr_gd1_mgmt_commit_op_req); out: @@ -1790,7 +1790,7 @@ out: } int32_t -glusterd3_1_brick_op_cbk (struct rpc_req *req, struct iovec *iov, +glusterd_brick_op_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gd1_mgmt_brick_op_rsp rsp = {0}; @@ -1889,7 +1889,7 @@ out: } int32_t -glusterd3_1_brick_op (call_frame_t *frame, xlator_t *this, +glusterd_brick_op (call_frame_t *frame, xlator_t *this, void *data) { gd1_mgmt_brick_op_req *req = NULL; @@ -1976,7 +1976,7 @@ glusterd3_1_brick_op (call_frame_t *frame, xlator_t *this, ret = glusterd_submit_request (rpc, req, dummy_frame, priv->gfs_mgmt, req->op, NULL, - this, glusterd3_1_brick_op_cbk, + this, glusterd_brick_op_cbk, (xdrproc_t)xdr_gd1_mgmt_brick_op_req); if (req) { if (req->input.input_val) @@ -2003,23 +2003,23 @@ out: struct rpc_clnt_procedure gd_brick_actors[GLUSTERD_BRICK_MAXVALUE] = { [GLUSTERD_BRICK_NULL] = {"NULL", NULL }, - [GLUSTERD_BRICK_OP] = {"BRICK_OP", glusterd3_1_brick_op}, + [GLUSTERD_BRICK_OP] = {"BRICK_OP", glusterd_brick_op}, }; struct rpc_clnt_procedure gd_peer_actors[GLUSTERD_FRIEND_MAXVALUE] = { [GLUSTERD_FRIEND_NULL] = {"NULL", NULL }, - [GLUSTERD_PROBE_QUERY] = {"PROBE_QUERY", glusterd3_1_probe}, - [GLUSTERD_FRIEND_ADD] = {"FRIEND_ADD", glusterd3_1_friend_add}, - [GLUSTERD_FRIEND_REMOVE] = {"FRIEND_REMOVE", glusterd3_1_friend_remove}, - [GLUSTERD_FRIEND_UPDATE] = {"FRIEND_UPDATE", glusterd3_1_friend_update}, + [GLUSTERD_PROBE_QUERY] = {"PROBE_QUERY", glusterd_rpc_probe}, + [GLUSTERD_FRIEND_ADD] = {"FRIEND_ADD", glusterd_rpc_friend_add}, + [GLUSTERD_FRIEND_REMOVE] = {"FRIEND_REMOVE", glusterd_rpc_friend_remove}, + [GLUSTERD_FRIEND_UPDATE] = {"FRIEND_UPDATE", glusterd_rpc_friend_update}, }; struct rpc_clnt_procedure gd_mgmt_actors[GLUSTERD_MGMT_MAXVALUE] = { [GLUSTERD_MGMT_NULL] = {"NULL", NULL }, - [GLUSTERD_MGMT_CLUSTER_LOCK] = {"CLUSTER_LOCK", glusterd3_1_cluster_lock}, - [GLUSTERD_MGMT_CLUSTER_UNLOCK] = {"CLUSTER_UNLOCK", glusterd3_1_cluster_unlock}, - [GLUSTERD_MGMT_STAGE_OP] = {"STAGE_OP", glusterd3_1_stage_op}, - [GLUSTERD_MGMT_COMMIT_OP] = {"COMMIT_OP", glusterd3_1_commit_op}, + [GLUSTERD_MGMT_CLUSTER_LOCK] = {"CLUSTER_LOCK", glusterd_cluster_lock}, + [GLUSTERD_MGMT_CLUSTER_UNLOCK] = {"CLUSTER_UNLOCK", glusterd_cluster_unlock}, + [GLUSTERD_MGMT_STAGE_OP] = {"STAGE_OP", glusterd_stage_op}, + [GLUSTERD_MGMT_COMMIT_OP] = {"COMMIT_OP", glusterd_commit_op}, }; struct rpc_clnt_program gd_mgmt_prog = { diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c index 3703f93b..f32fe171 100644 --- a/xlators/protocol/client/src/client-handshake.c +++ b/xlators/protocol/client/src/client-handshake.c @@ -25,7 +25,7 @@ #include "portmap-xdr.h" #include "rpc-common-xdr.h" -extern rpc_clnt_prog_t clnt3_1_fop_prog; +extern rpc_clnt_prog_t clnt3_3_fop_prog; extern rpc_clnt_prog_t clnt_pmap_prog; int client_ping_cbk (struct rpc_req *req, struct iovec *iov, int count, @@ -887,7 +887,7 @@ out: } int -client3_1_reopen_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_reopen_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { int32_t ret = -1; @@ -998,7 +998,7 @@ out: } int -client3_1_reopendir_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_reopendir_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { int32_t ret = -1; @@ -1125,7 +1125,7 @@ protocol_client_reopendir (xlator_t *this, clnt_fd_ctx_t *fdctx) ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_OPENDIR, - client3_1_reopendir_cbk, NULL, + client3_3_reopendir_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_opendir_req); if (ret) { @@ -1195,7 +1195,7 @@ protocol_client_reopen (xlator_t *this, clnt_fd_ctx_t *fdctx) local = NULL; ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_OPEN, client3_1_reopen_cbk, NULL, + GFS3_OP_OPEN, client3_3_reopen_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_open_req); if (ret) { @@ -1606,9 +1606,9 @@ select_server_supported_programs (xlator_t *this, gf_prog_detail *prog) while (trav) { /* Select 'programs' */ - if ((clnt3_1_fop_prog.prognum == trav->prognum) && - (clnt3_1_fop_prog.progver == trav->progver)) { - conf->fops = &clnt3_1_fop_prog; + if ((clnt3_3_fop_prog.prognum == trav->prognum) && + (clnt3_3_fop_prog.progver == trav->progver)) { + conf->fops = &clnt3_3_fop_prog; gf_log (this->name, GF_LOG_INFO, "Using Program %s, Num (%"PRId64"), " "Version (%"PRId64")", diff --git a/xlators/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c index 2356d1f8..66f93c73 100644 --- a/xlators/protocol/client/src/client-rpc-fops.c +++ b/xlators/protocol/client/src/client-rpc-fops.c @@ -20,7 +20,7 @@ int32_t client3_getspec (call_frame_t *frame, xlator_t *this, void *data); void client_start_ping (void *data); -rpc_clnt_prog_t clnt3_1_fop_prog; +rpc_clnt_prog_t clnt3_3_fop_prog; int @@ -132,7 +132,7 @@ unwind: /* CBK */ int -client3_1_symlink_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_symlink_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -204,7 +204,7 @@ out: int -client3_1_mknod_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_mknod_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -274,7 +274,7 @@ out: } int -client3_1_mkdir_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_mkdir_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -415,7 +415,7 @@ out: } int -client3_1_open_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_open_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { clnt_local_t *local = NULL; @@ -487,7 +487,7 @@ out: int -client3_1_stat_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_stat_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gfs3_stat_rsp rsp = {0,}; @@ -542,7 +542,7 @@ out: } int -client3_1_readlink_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_readlink_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gfs3_readlink_rsp rsp = {0,}; @@ -603,7 +603,7 @@ out: } int -client3_1_unlink_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_unlink_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -660,7 +660,7 @@ out: } int -client3_1_rmdir_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_rmdir_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gfs3_rmdir_rsp rsp = {0,}; @@ -718,7 +718,7 @@ out: int -client3_1_truncate_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_truncate_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gfs3_truncate_rsp rsp = {0,}; @@ -776,7 +776,7 @@ out: int -client3_1_statfs_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_statfs_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gfs3_statfs_rsp rsp = {0,}; @@ -831,7 +831,7 @@ out: int -client3_1_writev_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_writev_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gfs3_write_rsp rsp = {0,}; @@ -889,7 +889,7 @@ out: } int -client3_1_flush_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_flush_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -948,7 +948,7 @@ out: } int -client3_1_fsync_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_fsync_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gfs3_fsync_rsp rsp = {0,}; @@ -1006,7 +1006,7 @@ out: } int -client3_1_setxattr_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_setxattr_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1058,7 +1058,7 @@ out: } int -client3_1_getxattr_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_getxattr_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1133,7 +1133,7 @@ out: } int -client3_1_fgetxattr_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_fgetxattr_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1201,7 +1201,7 @@ out: } int -client3_1_removexattr_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_removexattr_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1251,7 +1251,7 @@ out: } int -client3_1_fremovexattr_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_fremovexattr_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1301,7 +1301,7 @@ out: } int -client3_1_fsyncdir_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_fsyncdir_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1350,7 +1350,7 @@ out: } int -client3_1_access_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_access_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1400,7 +1400,7 @@ out: int -client3_1_ftruncate_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_ftruncate_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gfs3_ftruncate_rsp rsp = {0,}; @@ -1457,7 +1457,7 @@ out: } int -client3_1_fstat_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_fstat_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { gfs3_fstat_rsp rsp = {0,}; @@ -1512,7 +1512,7 @@ out: int -client3_1_inodelk_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_inodelk_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1562,7 +1562,7 @@ out: } int -client3_1_finodelk_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_finodelk_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1612,7 +1612,7 @@ out: } int -client3_1_entrylk_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_entrylk_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1663,7 +1663,7 @@ out: } int -client3_1_fentrylk_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_fentrylk_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1714,7 +1714,7 @@ out: } int -client3_1_xattrop_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_xattrop_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1786,7 +1786,7 @@ out: } int -client3_1_fxattrop_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_fxattrop_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1854,7 +1854,7 @@ out: } int -client3_1_fsetxattr_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_fsetxattr_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1906,7 +1906,7 @@ out: } int -client3_1_fsetattr_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_fsetattr_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -1964,7 +1964,7 @@ out: int -client3_1_setattr_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_setattr_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -2022,7 +2022,7 @@ out: } int -client3_1_create_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_create_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -2102,7 +2102,7 @@ out: int -client3_1_rchecksum_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_rchecksum_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -2161,7 +2161,7 @@ out: } int -client3_1_lk_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_lk_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -2237,7 +2237,7 @@ out: } int -client3_1_readdir_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_readdir_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -2304,7 +2304,7 @@ out: int -client3_1_readdirp_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_readdirp_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -2368,7 +2368,7 @@ out: int -client3_1_rename_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_rename_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -2434,7 +2434,7 @@ out: } int -client3_1_link_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_link_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -2507,7 +2507,7 @@ out: int -client3_1_opendir_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_opendir_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { clnt_local_t *local = NULL; @@ -2578,7 +2578,7 @@ out: int -client3_1_lookup_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_lookup_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { clnt_local_t *local = NULL; @@ -2665,7 +2665,7 @@ out: } int -client3_1_readv_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_readv_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -2736,7 +2736,7 @@ out: } int -client3_1_release_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_release_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -2746,7 +2746,7 @@ client3_1_release_cbk (struct rpc_req *req, struct iovec *iov, int count, return 0; } int -client3_1_releasedir_cbk (struct rpc_req *req, struct iovec *iov, int count, +client3_3_releasedir_cbk (struct rpc_req *req, struct iovec *iov, int count, void *myframe) { call_frame_t *frame = NULL; @@ -2802,18 +2802,18 @@ client_fdctx_destroy (xlator_t *this, clnt_fd_ctx_t *fdctx) gfs3_releasedir_req req = {{0,},}; req.fd = fdctx->remote_fd; gf_log (this->name, GF_LOG_DEBUG, "sending releasedir on fd"); - client_submit_request (this, &req, fr, &clnt3_1_fop_prog, + client_submit_request (this, &req, fr, &clnt3_3_fop_prog, GFS3_OP_RELEASEDIR, - client3_1_releasedir_cbk, + client3_3_releasedir_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_releasedir_req); } else { gfs3_release_req req = {{0,},}; req.fd = fdctx->remote_fd; gf_log (this->name, GF_LOG_DEBUG, "sending release on fd"); - client_submit_request (this, &req, fr, &clnt3_1_fop_prog, + client_submit_request (this, &req, fr, &clnt3_3_fop_prog, GFS3_OP_RELEASE, - client3_1_release_cbk, NULL, + client3_3_release_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_release_req); } @@ -2832,7 +2832,7 @@ out: } int32_t -client3_1_releasedir (call_frame_t *frame, xlator_t *this, +client3_3_releasedir (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -2873,7 +2873,7 @@ out: } int32_t -client3_1_release (call_frame_t *frame, xlator_t *this, +client3_3_release (call_frame_t *frame, xlator_t *this, void *data) { int64_t remote_fd = -1; @@ -2917,7 +2917,7 @@ out: int32_t -client3_1_lookup (call_frame_t *frame, xlator_t *this, +client3_3_lookup (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -3003,7 +3003,7 @@ client3_1_lookup (call_frame_t *frame, xlator_t *this, req.bname = ""; ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_LOOKUP, client3_1_lookup_cbk, + GFS3_OP_LOOKUP, client3_3_lookup_cbk, NULL, rsphdr, count, NULL, 0, local->iobref, (xdrproc_t)xdr_gfs3_lookup_req); @@ -3040,7 +3040,7 @@ unwind: } int32_t -client3_1_stat (call_frame_t *frame, xlator_t *this, +client3_3_stat (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -3070,7 +3070,7 @@ client3_1_stat (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_STAT, client3_1_stat_cbk, NULL, + GFS3_OP_STAT, client3_3_stat_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_stat_req); if (ret) { @@ -3092,7 +3092,7 @@ unwind: int32_t -client3_1_truncate (call_frame_t *frame, xlator_t *this, +client3_3_truncate (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -3126,7 +3126,7 @@ client3_1_truncate (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_TRUNCATE, - client3_1_truncate_cbk, NULL, + client3_3_truncate_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_truncate_req); if (ret) { @@ -3147,7 +3147,7 @@ unwind: int32_t -client3_1_ftruncate (call_frame_t *frame, xlator_t *this, +client3_3_ftruncate (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -3175,7 +3175,7 @@ client3_1_ftruncate (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_FTRUNCATE, - client3_1_ftruncate_cbk, NULL, + client3_3_ftruncate_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_ftruncate_req); if (ret) { @@ -3197,7 +3197,7 @@ unwind: int32_t -client3_1_access (call_frame_t *frame, xlator_t *this, +client3_3_access (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -3231,7 +3231,7 @@ client3_1_access (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_ACCESS, - client3_1_access_cbk, NULL, + client3_3_access_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_access_req); if (ret) { @@ -3251,7 +3251,7 @@ unwind: } int32_t -client3_1_readlink (call_frame_t *frame, xlator_t *this, +client3_3_readlink (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -3318,7 +3318,7 @@ client3_1_readlink (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_READLINK, - client3_1_readlink_cbk, NULL, + client3_3_readlink_cbk, NULL, rsphdr, count, NULL, 0, local->iobref, (xdrproc_t)xdr_gfs3_readlink_req); @@ -3346,7 +3346,7 @@ unwind: int32_t -client3_1_unlink (call_frame_t *frame, xlator_t *this, +client3_3_unlink (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -3379,7 +3379,7 @@ client3_1_unlink (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_UNLINK, - client3_1_unlink_cbk, NULL, + client3_3_unlink_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_unlink_req); if (ret) { @@ -3401,7 +3401,7 @@ unwind: int32_t -client3_1_rmdir (call_frame_t *frame, xlator_t *this, +client3_3_rmdir (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -3434,7 +3434,7 @@ client3_1_rmdir (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_RMDIR, client3_1_rmdir_cbk, NULL, + GFS3_OP_RMDIR, client3_3_rmdir_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_rmdir_req); if (ret) { @@ -3455,7 +3455,7 @@ unwind: int32_t -client3_1_symlink (call_frame_t *frame, xlator_t *this, +client3_3_symlink (call_frame_t *frame, xlator_t *this, void *data) { clnt_local_t *local = NULL; @@ -3501,7 +3501,7 @@ client3_1_symlink (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_SYMLINK, client3_1_symlink_cbk, + GFS3_OP_SYMLINK, client3_3_symlink_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_symlink_req); if (ret) { @@ -3526,7 +3526,7 @@ unwind: int32_t -client3_1_rename (call_frame_t *frame, xlator_t *this, +client3_3_rename (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -3568,7 +3568,7 @@ client3_1_rename (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_RENAME, client3_1_rename_cbk, NULL, + GFS3_OP_RENAME, client3_3_rename_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_rename_req); if (ret) { @@ -3592,7 +3592,7 @@ unwind: int32_t -client3_1_link (call_frame_t *frame, xlator_t *this, +client3_3_link (call_frame_t *frame, xlator_t *this, void *data) { clnt_local_t *local = NULL; @@ -3644,7 +3644,7 @@ client3_1_link (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_LINK, client3_1_link_cbk, NULL, + GFS3_OP_LINK, client3_3_link_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_link_req); if (ret) { @@ -3666,7 +3666,7 @@ unwind: int32_t -client3_1_mknod (call_frame_t *frame, xlator_t *this, +client3_3_mknod (call_frame_t *frame, xlator_t *this, void *data) { clnt_local_t *local = NULL; @@ -3712,7 +3712,7 @@ client3_1_mknod (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_MKNOD, client3_1_mknod_cbk, NULL, + GFS3_OP_MKNOD, client3_3_mknod_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_mknod_req); if (ret) { @@ -3735,7 +3735,7 @@ unwind: int32_t -client3_1_mkdir (call_frame_t *frame, xlator_t *this, +client3_3_mkdir (call_frame_t *frame, xlator_t *this, void *data) { clnt_local_t *local = NULL; @@ -3781,7 +3781,7 @@ client3_1_mkdir (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_MKDIR, client3_1_mkdir_cbk, NULL, + GFS3_OP_MKDIR, client3_3_mkdir_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_mkdir_req); if (ret) { @@ -3803,7 +3803,7 @@ unwind: int32_t -client3_1_create (call_frame_t *frame, xlator_t *this, +client3_3_create (call_frame_t *frame, xlator_t *this, void *data) { clnt_local_t *local = NULL; @@ -3851,7 +3851,7 @@ client3_1_create (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_CREATE, client3_1_create_cbk, NULL, + GFS3_OP_CREATE, client3_3_create_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_create_req); if (ret) { @@ -3875,7 +3875,7 @@ unwind: int32_t -client3_1_open (call_frame_t *frame, xlator_t *this, +client3_3_open (call_frame_t *frame, xlator_t *this, void *data) { clnt_local_t *local = NULL; @@ -3919,7 +3919,7 @@ client3_1_open (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_OPEN, client3_1_open_cbk, NULL, + GFS3_OP_OPEN, client3_3_open_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_open_req); if (ret) { @@ -3942,7 +3942,7 @@ unwind: int32_t -client3_1_readv (call_frame_t *frame, xlator_t *this, +client3_3_readv (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -4014,7 +4014,7 @@ client3_1_readv (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_READ, client3_1_readv_cbk, NULL, + GFS3_OP_READ, client3_3_readv_cbk, NULL, NULL, 0, &rsp_vec, 1, local->iobref, (xdrproc_t)xdr_gfs3_read_req); @@ -4048,7 +4048,7 @@ unwind: int32_t -client3_1_writev (call_frame_t *frame, xlator_t *this, void *data) +client3_3_writev (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; int64_t remote_fd = -1; @@ -4084,7 +4084,7 @@ client3_1_writev (call_frame_t *frame, xlator_t *this, void *data) req.xdata.xdata_len, op_errno, unwind); ret = client_submit_vec_request (this, &req, frame, conf->fops, - GFS3_OP_WRITE, client3_1_writev_cbk, + GFS3_OP_WRITE, client3_3_writev_cbk, args->vector, args->count, args->iobref, (xdrproc_t)xdr_gfs3_write_req); @@ -4112,7 +4112,7 @@ unwind: int32_t -client3_1_flush (call_frame_t *frame, xlator_t *this, +client3_3_flush (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -4150,7 +4150,7 @@ client3_1_flush (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_FLUSH, client3_1_flush_cbk, NULL, + GFS3_OP_FLUSH, client3_3_flush_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_flush_req); if (ret) { @@ -4174,7 +4174,7 @@ unwind: int32_t -client3_1_fsync (call_frame_t *frame, xlator_t *this, +client3_3_fsync (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -4200,7 +4200,7 @@ client3_1_fsync (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_FSYNC, client3_1_fsync_cbk, NULL, + GFS3_OP_FSYNC, client3_3_fsync_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_fsync_req); if (ret) { @@ -4224,7 +4224,7 @@ unwind: int32_t -client3_1_fstat (call_frame_t *frame, xlator_t *this, +client3_3_fstat (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -4249,7 +4249,7 @@ client3_1_fstat (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_FSTAT, client3_1_fstat_cbk, NULL, + GFS3_OP_FSTAT, client3_3_fstat_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_fstat_req); if (ret) { @@ -4272,7 +4272,7 @@ unwind: int32_t -client3_1_opendir (call_frame_t *frame, xlator_t *this, +client3_3_opendir (call_frame_t *frame, xlator_t *this, void *data) { clnt_local_t *local = NULL; @@ -4314,7 +4314,7 @@ client3_1_opendir (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_OPENDIR, client3_1_opendir_cbk, + GFS3_OP_OPENDIR, client3_3_opendir_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_opendir_req); if (ret) { @@ -4338,7 +4338,7 @@ unwind: int32_t -client3_1_fsyncdir (call_frame_t *frame, xlator_t *this, void *data) +client3_3_fsyncdir (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; int64_t remote_fd = -1; @@ -4365,7 +4365,7 @@ client3_1_fsyncdir (call_frame_t *frame, xlator_t *this, void *data) req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_FSYNCDIR, client3_1_fsyncdir_cbk, + GFS3_OP_FSYNCDIR, client3_3_fsyncdir_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_fsyncdir_req); @@ -4389,7 +4389,7 @@ unwind: int32_t -client3_1_statfs (call_frame_t *frame, xlator_t *this, +client3_3_statfs (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -4424,7 +4424,7 @@ client3_1_statfs (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_STATFS, client3_1_statfs_cbk, NULL, + GFS3_OP_STATFS, client3_3_statfs_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_statfs_req); if (ret) { @@ -4447,7 +4447,7 @@ unwind: int32_t -client3_1_setxattr (call_frame_t *frame, xlator_t *this, +client3_3_setxattr (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -4487,7 +4487,7 @@ client3_1_setxattr (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_SETXATTR, client3_1_setxattr_cbk, + GFS3_OP_SETXATTR, client3_3_setxattr_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_setxattr_req); if (ret) { @@ -4514,7 +4514,7 @@ unwind: int32_t -client3_1_fsetxattr (call_frame_t *frame, xlator_t *this, +client3_3_fsetxattr (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -4547,7 +4547,7 @@ client3_1_fsetxattr (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, - GFS3_OP_FSETXATTR, client3_1_fsetxattr_cbk, + GFS3_OP_FSETXATTR, client3_3_fsetxattr_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_fsetxattr_req); if (ret) { @@ -4576,7 +4576,7 @@ unwind: int32_t -client3_1_fgetxattr (call_frame_t *frame, xlator_t *this, +client3_3_fgetxattr (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -4645,7 +4645,7 @@ client3_1_fgetxattr (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_FGETXATTR, - client3_1_fgetxattr_cbk, NULL, + client3_3_fgetxattr_cbk, NULL, rsphdr, count, NULL, 0, local->iobref, (xdrproc_t)xdr_gfs3_fgetxattr_req); @@ -4681,7 +4681,7 @@ unwind: int32_t -client3_1_getxattr (call_frame_t *frame, xlator_t *this, +client3_3_getxattr (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -4787,7 +4787,7 @@ client3_1_getxattr (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_GETXATTR, - client3_1_getxattr_cbk, NULL, + client3_3_getxattr_cbk, NULL, rsphdr, count, NULL, 0, local->iobref, (xdrproc_t)xdr_gfs3_getxattr_req); @@ -4823,7 +4823,7 @@ unwind: int32_t -client3_1_xattrop (call_frame_t *frame, xlator_t *this, +client3_3_xattrop (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -4901,7 +4901,7 @@ client3_1_xattrop (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_XATTROP, - client3_1_xattrop_cbk, NULL, + client3_3_xattrop_cbk, NULL, rsphdr, count, NULL, 0, local->iobref, (xdrproc_t)xdr_gfs3_xattrop_req); @@ -4944,7 +4944,7 @@ unwind: int32_t -client3_1_fxattrop (call_frame_t *frame, xlator_t *this, +client3_3_fxattrop (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -5014,7 +5014,7 @@ client3_1_fxattrop (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_FXATTROP, - client3_1_fxattrop_cbk, NULL, + client3_3_fxattrop_cbk, NULL, rsphdr, count, NULL, 0, local->iobref, (xdrproc_t)xdr_gfs3_fxattrop_req); @@ -5055,7 +5055,7 @@ unwind: int32_t -client3_1_removexattr (call_frame_t *frame, xlator_t *this, +client3_3_removexattr (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -5089,7 +5089,7 @@ client3_1_removexattr (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_REMOVEXATTR, - client3_1_removexattr_cbk, NULL, + client3_3_removexattr_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_removexattr_req); if (ret) { @@ -5109,7 +5109,7 @@ unwind: } int32_t -client3_1_fremovexattr (call_frame_t *frame, xlator_t *this, +client3_3_fremovexattr (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -5140,7 +5140,7 @@ client3_1_fremovexattr (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_FREMOVEXATTR, - client3_1_fremovexattr_cbk, NULL, + client3_3_fremovexattr_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_fremovexattr_req); if (ret) { @@ -5160,7 +5160,7 @@ unwind: } int32_t -client3_1_lk (call_frame_t *frame, xlator_t *this, +client3_3_lk (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -5222,7 +5222,7 @@ client3_1_lk (call_frame_t *frame, xlator_t *this, req.xdata.xdata_len, op_errno, unwind); ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_LK, - client3_1_lk_cbk, NULL, + client3_3_lk_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_lk_req); if (ret) { @@ -5243,7 +5243,7 @@ unwind: int32_t -client3_1_inodelk (call_frame_t *frame, xlator_t *this, +client3_3_inodelk (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -5306,7 +5306,7 @@ client3_1_inodelk (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_INODELK, - client3_1_inodelk_cbk, NULL, + client3_3_inodelk_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_inodelk_req); if (ret) { @@ -5328,7 +5328,7 @@ unwind: int32_t -client3_1_finodelk (call_frame_t *frame, xlator_t *this, +client3_3_finodelk (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -5384,7 +5384,7 @@ client3_1_finodelk (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_FINODELK, - client3_1_finodelk_cbk, NULL, + client3_3_finodelk_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_finodelk_req); if (ret) { @@ -5404,7 +5404,7 @@ unwind: int32_t -client3_1_entrylk (call_frame_t *frame, xlator_t *this, +client3_3_entrylk (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -5445,7 +5445,7 @@ client3_1_entrylk (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_ENTRYLK, - client3_1_entrylk_cbk, NULL, + client3_3_entrylk_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_entrylk_req); if (ret) { @@ -5467,7 +5467,7 @@ unwind: int32_t -client3_1_fentrylk (call_frame_t *frame, xlator_t *this, +client3_3_fentrylk (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -5501,7 +5501,7 @@ client3_1_fentrylk (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_FENTRYLK, - client3_1_fentrylk_cbk, NULL, + client3_3_fentrylk_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_fentrylk_req); if (ret) { @@ -5522,7 +5522,7 @@ unwind: int32_t -client3_1_rchecksum (call_frame_t *frame, xlator_t *this, +client3_3_rchecksum (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -5549,7 +5549,7 @@ client3_1_rchecksum (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_RCHECKSUM, - client3_1_rchecksum_cbk, NULL, + client3_3_rchecksum_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_rchecksum_req); @@ -5572,7 +5572,7 @@ unwind: int32_t -client3_1_readdir (call_frame_t *frame, xlator_t *this, +client3_3_readdir (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -5647,7 +5647,7 @@ client3_1_readdir (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_READDIR, - client3_1_readdir_cbk, NULL, + client3_3_readdir_cbk, NULL, rsphdr, count, NULL, 0, rsp_iobref, (xdrproc_t)xdr_gfs3_readdir_req); @@ -5683,7 +5683,7 @@ unwind: int32_t -client3_1_readdirp (call_frame_t *frame, xlator_t *this, +client3_3_readdirp (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; @@ -5760,7 +5760,7 @@ client3_1_readdirp (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_READDIRP, - client3_1_readdirp_cbk, NULL, + client3_3_readdirp_cbk, NULL, rsphdr, count, NULL, 0, rsp_iobref, (xdrproc_t)xdr_gfs3_readdirp_req); @@ -5794,7 +5794,7 @@ unwind: int32_t -client3_1_setattr (call_frame_t *frame, xlator_t *this, +client3_3_setattr (call_frame_t *frame, xlator_t *this, void *data) { clnt_conf_t *conf = NULL; @@ -5829,7 +5829,7 @@ client3_1_setattr (call_frame_t *frame, xlator_t *this, ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_SETATTR, - client3_1_setattr_cbk, NULL, + client3_3_setattr_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_setattr_req); if (ret) { @@ -5849,7 +5849,7 @@ unwind: } int32_t -client3_1_fsetattr (call_frame_t *frame, xlator_t *this, void *data) +client3_3_fsetattr (call_frame_t *frame, xlator_t *this, void *data) { clnt_args_t *args = NULL; int64_t remote_fd = -1; @@ -5875,7 +5875,7 @@ client3_1_fsetattr (call_frame_t *frame, xlator_t *this, void *data) ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_FSETATTR, - client3_1_fsetattr_cbk, NULL, + client3_3_fsetattr_cbk, NULL, NULL, 0, NULL, 0, NULL, (xdrproc_t)xdr_gfs3_fsetattr_req); if (ret) { @@ -5899,56 +5899,56 @@ unwind: /* Table Specific to FOPS */ -rpc_clnt_procedure_t clnt3_1_fop_actors[GF_FOP_MAXVALUE] = { +rpc_clnt_procedure_t clnt3_3_fop_actors[GF_FOP_MAXVALUE] = { [GF_FOP_NULL] = { "NULL", NULL}, - [GF_FOP_STAT] = { "STAT", client3_1_stat }, - [GF_FOP_READLINK] = { "READLINK", client3_1_readlink }, - [GF_FOP_MKNOD] = { "MKNOD", client3_1_mknod }, - [GF_FOP_MKDIR] = { "MKDIR", client3_1_mkdir }, - [GF_FOP_UNLINK] = { "UNLINK", client3_1_unlink }, - [GF_FOP_RMDIR] = { "RMDIR", client3_1_rmdir }, - [GF_FOP_SYMLINK] = { "SYMLINK", client3_1_symlink }, - [GF_FOP_RENAME] = { "RENAME", client3_1_rename }, - [GF_FOP_LINK] = { "LINK", client3_1_link }, - [GF_FOP_TRUNCATE] = { "TRUNCATE", client3_1_truncate }, - [GF_FOP_OPEN] = { "OPEN", client3_1_open }, - [GF_FOP_READ] = { "READ", client3_1_readv }, - [GF_FOP_WRITE] = { "WRITE", client3_1_writev }, - [GF_FOP_STATFS] = { "STATFS", client3_1_statfs }, - [GF_FOP_FLUSH] = { "FLUSH", client3_1_flush }, - [GF_FOP_FSYNC] = { "FSYNC", client3_1_fsync }, - [GF_FOP_SETXATTR] = { "SETXATTR", client3_1_setxattr }, - [GF_FOP_GETXATTR] = { "GETXATTR", client3_1_getxattr }, - [GF_FOP_REMOVEXATTR] = { "REMOVEXATTR", client3_1_removexattr }, - [GF_FOP_OPENDIR] = { "OPENDIR", client3_1_opendir }, - [GF_FOP_FSYNCDIR] = { "FSYNCDIR", client3_1_fsyncdir }, - [GF_FOP_ACCESS] = { "ACCESS", client3_1_access }, - [GF_FOP_CREATE] = { "CREATE", client3_1_create }, - [GF_FOP_FTRUNCATE] = { "FTRUNCATE", client3_1_ftruncate }, - [GF_FOP_FSTAT] = { "FSTAT", client3_1_fstat }, - [GF_FOP_LK] = { "LK", client3_1_lk }, - [GF_FOP_LOOKUP] = { "LOOKUP", client3_1_lookup }, - [GF_FOP_READDIR] = { "READDIR", client3_1_readdir }, - [GF_FOP_INODELK] = { "INODELK", client3_1_inodelk }, - [GF_FOP_FINODELK] = { "FINODELK", client3_1_finodelk }, - [GF_FOP_ENTRYLK] = { "ENTRYLK", client3_1_entrylk }, - [GF_FOP_FENTRYLK] = { "FENTRYLK", client3_1_fentrylk }, - [GF_FOP_XATTROP] = { "XATTROP", client3_1_xattrop }, - [GF_FOP_FXATTROP] = { "FXATTROP", client3_1_fxattrop }, - [GF_FOP_FGETXATTR] = { "FGETXATTR", client3_1_fgetxattr }, - [GF_FOP_FSETXATTR] = { "FSETXATTR", client3_1_fsetxattr }, - [GF_FOP_RCHECKSUM] = { "RCHECKSUM", client3_1_rchecksum }, - [GF_FOP_SETATTR] = { "SETATTR", client3_1_setattr }, - [GF_FOP_FSETATTR] = { "FSETATTR", client3_1_fsetattr }, - [GF_FOP_READDIRP] = { "READDIRP", client3_1_readdirp }, - [GF_FOP_RELEASE] = { "RELEASE", client3_1_release }, - [GF_FOP_RELEASEDIR] = { "RELEASEDIR", client3_1_releasedir }, + [GF_FOP_STAT] = { "STAT", client3_3_stat }, + [GF_FOP_READLINK] = { "READLINK", client3_3_readlink }, + [GF_FOP_MKNOD] = { "MKNOD", client3_3_mknod }, + [GF_FOP_MKDIR] = { "MKDIR", client3_3_mkdir }, + [GF_FOP_UNLINK] = { "UNLINK", client3_3_unlink }, + [GF_FOP_RMDIR] = { "RMDIR", client3_3_rmdir }, + [GF_FOP_SYMLINK] = { "SYMLINK", client3_3_symlink }, + [GF_FOP_RENAME] = { "RENAME", client3_3_rename }, + [GF_FOP_LINK] = { "LINK", client3_3_link }, + [GF_FOP_TRUNCATE] = { "TRUNCATE", client3_3_truncate }, + [GF_FOP_OPEN] = { "OPEN", client3_3_open }, + [GF_FOP_READ] = { "READ", client3_3_readv }, + [GF_FOP_WRITE] = { "WRITE", client3_3_writev }, + [GF_FOP_STATFS] = { "STATFS", client3_3_statfs }, + [GF_FOP_FLUSH] = { "FLUSH", client3_3_flush }, + [GF_FOP_FSYNC] = { "FSYNC", client3_3_fsync }, + [GF_FOP_SETXATTR] = { "SETXATTR", client3_3_setxattr }, + [GF_FOP_GETXATTR] = { "GETXATTR", client3_3_getxattr }, + [GF_FOP_REMOVEXATTR] = { "REMOVEXATTR", client3_3_removexattr }, + [GF_FOP_OPENDIR] = { "OPENDIR", client3_3_opendir }, + [GF_FOP_FSYNCDIR] = { "FSYNCDIR", client3_3_fsyncdir }, + [GF_FOP_ACCESS] = { "ACCESS", client3_3_access }, + [GF_FOP_CREATE] = { "CREATE", client3_3_create }, + [GF_FOP_FTRUNCATE] = { "FTRUNCATE", client3_3_ftruncate }, + [GF_FOP_FSTAT] = { "FSTAT", client3_3_fstat }, + [GF_FOP_LK] = { "LK", client3_3_lk }, + [GF_FOP_LOOKUP] = { "LOOKUP", client3_3_lookup }, + [GF_FOP_READDIR] = { "READDIR", client3_3_readdir }, + [GF_FOP_INODELK] = { "INODELK", client3_3_inodelk }, + [GF_FOP_FINODELK] = { "FINODELK", client3_3_finodelk }, + [GF_FOP_ENTRYLK] = { "ENTRYLK", client3_3_entrylk }, + [GF_FOP_FENTRYLK] = { "FENTRYLK", client3_3_fentrylk }, + [GF_FOP_XATTROP] = { "XATTROP", client3_3_xattrop }, + [GF_FOP_FXATTROP] = { "FXATTROP", client3_3_fxattrop }, + [GF_FOP_FGETXATTR] = { "FGETXATTR", client3_3_fgetxattr }, + [GF_FOP_FSETXATTR] = { "FSETXATTR", client3_3_fsetxattr }, + [GF_FOP_RCHECKSUM] = { "RCHECKSUM", client3_3_rchecksum }, + [GF_FOP_SETATTR] = { "SETATTR", client3_3_setattr }, + [GF_FOP_FSETATTR] = { "FSETATTR", client3_3_fsetattr }, + [GF_FOP_READDIRP] = { "READDIRP", client3_3_readdirp }, + [GF_FOP_RELEASE] = { "RELEASE", client3_3_release }, + [GF_FOP_RELEASEDIR] = { "RELEASEDIR", client3_3_releasedir }, [GF_FOP_GETSPEC] = { "GETSPEC", client3_getspec }, - [GF_FOP_FREMOVEXATTR] = { "FREMOVEXATTR", client3_1_fremovexattr }, + [GF_FOP_FREMOVEXATTR] = { "FREMOVEXATTR", client3_3_fremovexattr }, }; /* Used From RPC-CLNT library to log proper name of procedure based on number */ -char *clnt3_1_fop_names[GFS3_OP_MAXVALUE] = { +char *clnt3_3_fop_names[GFS3_OP_MAXVALUE] = { [GFS3_OP_NULL] = "NULL", [GFS3_OP_STAT] = "STAT", [GFS3_OP_READLINK] = "READLINK", @@ -5995,11 +5995,11 @@ char *clnt3_1_fop_names[GFS3_OP_MAXVALUE] = { [GFS3_OP_FREMOVEXATTR] = "FREMOVEXATTR", }; -rpc_clnt_prog_t clnt3_1_fop_prog = { - .progname = "GlusterFS 3.1", - .prognum = GLUSTER3_1_FOP_PROGRAM, - .progver = GLUSTER3_1_FOP_VERSION, - .numproc = GLUSTER3_1_FOP_PROCCNT, - .proctable = clnt3_1_fop_actors, - .procnames = clnt3_1_fop_names, +rpc_clnt_prog_t clnt3_3_fop_prog = { + .progname = "GlusterFS 3.3", + .prognum = GLUSTER_FOP_PROGRAM, + .progver = GLUSTER_FOP_VERSION, + .numproc = GLUSTER_FOP_PROCCNT, + .proctable = clnt3_3_fop_actors, + .procnames = clnt3_3_fop_names, }; diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c index abccc389..b429eb6b 100644 --- a/xlators/protocol/server/src/server-handshake.c +++ b/xlators/protocol/server/src/server-handshake.c @@ -40,7 +40,7 @@ gf_compare_client_version (rpcsvc_request_t *req, int fop_prognum, { int ret = -1; /* TODO: think.. */ - if (glusterfs3_1_fop_prog.prognum == fop_prognum) + if (glusterfs3_3_fop_prog.prognum == fop_prognum) ret = 0; return ret; diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c index b0acd935..8f4aaecc 100644 --- a/xlators/protocol/server/src/server-rpc-fops.c +++ b/xlators/protocol/server/src/server-rpc-fops.c @@ -2931,7 +2931,7 @@ err: /* Fop section */ int -server_stat (rpcsvc_request_t *req) +server3_3_stat (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -2989,7 +2989,7 @@ out: int -server_setattr (rpcsvc_request_t *req) +server3_3_setattr (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -3047,7 +3047,7 @@ out: int -server_fsetattr (rpcsvc_request_t *req) +server3_3_fsetattr (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -3105,7 +3105,7 @@ out: int -server_readlink (rpcsvc_request_t *req) +server3_3_readlink (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -3162,7 +3162,7 @@ out: int -server_create (rpcsvc_request_t *req) +server3_3_create (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -3231,7 +3231,7 @@ out: int -server_open (rpcsvc_request_t *req) +server3_3_open (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -3287,7 +3287,7 @@ out: int -server_readv (rpcsvc_request_t *req) +server3_3_readv (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -3347,7 +3347,7 @@ out: int -server_writev (rpcsvc_request_t *req) +server3_3_writev (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -3429,18 +3429,18 @@ out: int -server_writev_vec (rpcsvc_request_t *req, struct iovec *payload, +server3_3_writev_vec (rpcsvc_request_t *req, struct iovec *payload, int payload_count, struct iobref *iobref) { - return server_writev (req); + return server3_3_writev (req); } -#define SERVER3_1_VECWRITE_START 0 -#define SERVER3_1_VECWRITE_READING_HDR 1 -#define SERVER3_1_VECWRITE_READING_OPAQUE 2 +#define SERVER3_3_VECWRITE_START 0 +#define SERVER3_3_VECWRITE_READING_HDR 1 +#define SERVER3_3_VECWRITE_READING_OPAQUE 2 int -server_writev_vecsizer (int state, ssize_t *readsize, char *base_addr, +server3_3_writev_vecsizer (int state, ssize_t *readsize, char *base_addr, char *curr_addr) { ssize_t size = 0; @@ -3449,13 +3449,13 @@ server_writev_vecsizer (int state, ssize_t *readsize, char *base_addr, XDR xdr; switch (state) { - case SERVER3_1_VECWRITE_START: + case SERVER3_3_VECWRITE_START: size = xdr_sizeof ((xdrproc_t) xdr_gfs3_write_req, &write_req); *readsize = size; - nextstate = SERVER3_1_VECWRITE_READING_HDR; + nextstate = SERVER3_3_VECWRITE_READING_HDR; break; - case SERVER3_1_VECWRITE_READING_HDR: + case SERVER3_3_VECWRITE_READING_HDR: size = xdr_sizeof ((xdrproc_t) xdr_gfs3_write_req, &write_req); @@ -3472,18 +3472,18 @@ server_writev_vecsizer (int state, ssize_t *readsize, char *base_addr, *readsize = size; if (!size) - nextstate = SERVER3_1_VECWRITE_START; + nextstate = SERVER3_3_VECWRITE_START; else - nextstate = SERVER3_1_VECWRITE_READING_OPAQUE; + nextstate = SERVER3_3_VECWRITE_READING_OPAQUE; if (write_req.xdata.xdata_val) free (write_req.xdata.xdata_val); break; - case SERVER3_1_VECWRITE_READING_OPAQUE: + case SERVER3_3_VECWRITE_READING_OPAQUE: *readsize = 0; - nextstate = SERVER3_1_VECWRITE_START; + nextstate = SERVER3_3_VECWRITE_START; break; default: gf_log ("server", GF_LOG_ERROR, "wrong state: %d", state); @@ -3494,7 +3494,7 @@ server_writev_vecsizer (int state, ssize_t *readsize, char *base_addr, int -server_release (rpcsvc_request_t *req) +server3_3_release (rpcsvc_request_t *req) { server_connection_t *conn = NULL; gfs3_release_req args = {{0,},}; @@ -3523,7 +3523,7 @@ out: } int -server_releasedir (rpcsvc_request_t *req) +server3_3_releasedir (rpcsvc_request_t *req) { server_connection_t *conn = NULL; gfs3_releasedir_req args = {{0,},}; @@ -3554,7 +3554,7 @@ out: int -server_fsync (rpcsvc_request_t *req) +server3_3_fsync (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -3611,7 +3611,7 @@ out: int -server_flush (rpcsvc_request_t *req) +server3_3_flush (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -3667,7 +3667,7 @@ out: int -server_ftruncate (rpcsvc_request_t *req) +server3_3_ftruncate (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -3723,7 +3723,7 @@ out: int -server_fstat (rpcsvc_request_t *req) +server3_3_fstat (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -3778,7 +3778,7 @@ out: int -server_truncate (rpcsvc_request_t *req) +server3_3_truncate (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -3834,7 +3834,7 @@ out: int -server_unlink (rpcsvc_request_t *req) +server3_3_unlink (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -3893,7 +3893,7 @@ out: int -server_setxattr (rpcsvc_request_t *req) +server3_3_setxattr (rpcsvc_request_t *req) { server_state_t *state = NULL; dict_t *dict = NULL; @@ -3967,7 +3967,7 @@ out: int -server_fsetxattr (rpcsvc_request_t *req) +server3_3_fsetxattr (rpcsvc_request_t *req) { server_state_t *state = NULL; dict_t *dict = NULL; @@ -4038,7 +4038,7 @@ out: int -server_fxattrop (rpcsvc_request_t *req) +server3_3_fxattrop (rpcsvc_request_t *req) { dict_t *dict = NULL; server_state_t *state = NULL; @@ -4110,7 +4110,7 @@ out: int -server_xattrop (rpcsvc_request_t *req) +server3_3_xattrop (rpcsvc_request_t *req) { dict_t *dict = NULL; server_state_t *state = NULL; @@ -4180,7 +4180,7 @@ out: int -server_getxattr (rpcsvc_request_t *req) +server3_3_getxattr (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -4242,7 +4242,7 @@ out: int -server_fgetxattr (rpcsvc_request_t *req) +server3_3_fgetxattr (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -4302,7 +4302,7 @@ out: int -server_removexattr (rpcsvc_request_t *req) +server3_3_removexattr (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -4358,7 +4358,7 @@ out: } int -server_fremovexattr (rpcsvc_request_t *req) +server3_3_fremovexattr (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -4419,7 +4419,7 @@ out: int -server_opendir (rpcsvc_request_t *req) +server3_3_opendir (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -4473,7 +4473,7 @@ out: int -server_readdirp (rpcsvc_request_t *req) +server3_3_readdirp (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -4542,7 +4542,7 @@ out: } int -server_readdir (rpcsvc_request_t *req) +server3_3_readdir (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -4609,7 +4609,7 @@ out: } int -server_fsyncdir (rpcsvc_request_t *req) +server3_3_fsyncdir (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -4666,7 +4666,7 @@ out: int -server_mknod (rpcsvc_request_t *req) +server3_3_mknod (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -4730,7 +4730,7 @@ out: int -server_mkdir (rpcsvc_request_t *req) +server3_3_mkdir (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -4792,7 +4792,7 @@ out: int -server_rmdir (rpcsvc_request_t *req) +server3_3_rmdir (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -4852,7 +4852,7 @@ out: int -server_inodelk (rpcsvc_request_t *req) +server3_3_inodelk (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -4941,7 +4941,7 @@ out: } int -server_finodelk (rpcsvc_request_t *req) +server3_3_finodelk (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -5030,7 +5030,7 @@ out: int -server_entrylk (rpcsvc_request_t *req) +server3_3_entrylk (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -5093,7 +5093,7 @@ out: } int -server_fentrylk (rpcsvc_request_t *req) +server3_3_fentrylk (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -5156,7 +5156,7 @@ out: } int -server_access (rpcsvc_request_t *req) +server3_3_access (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -5212,7 +5212,7 @@ out: int -server_symlink (rpcsvc_request_t *req) +server3_3_symlink (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -5275,7 +5275,7 @@ out: int -server_link (rpcsvc_request_t *req) +server3_3_link (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -5335,7 +5335,7 @@ out: int -server_rename (rpcsvc_request_t *req) +server3_3_rename (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -5396,7 +5396,7 @@ out: } int -server_lk (rpcsvc_request_t *req) +server3_3_lk (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -5502,7 +5502,7 @@ out: int -server_rchecksum (rpcsvc_request_t *req) +server3_3_rchecksum (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -5571,7 +5571,7 @@ server_null (rpcsvc_request_t *req) } int -server_lookup (rpcsvc_request_t *req) +server3_3_lookup (rpcsvc_request_t *req) { call_frame_t *frame = NULL; server_state_t *state = NULL; @@ -5637,7 +5637,7 @@ err: } int -server_statfs (rpcsvc_request_t *req) +server3_3_statfs (rpcsvc_request_t *req) { server_state_t *state = NULL; call_frame_t *frame = NULL; @@ -5687,58 +5687,58 @@ out: } -rpcsvc_actor_t glusterfs3_1_fop_actors[] = { +rpcsvc_actor_t glusterfs3_3_fop_actors[] = { [GFS3_OP_NULL] = { "NULL", GFS3_OP_NULL, server_null, NULL, NULL, 0}, - [GFS3_OP_STAT] = { "STAT", GFS3_OP_STAT, server_stat, NULL, NULL, 0}, - [GFS3_OP_READLINK] = { "READLINK", GFS3_OP_READLINK, server_readlink, NULL, NULL, 0}, - [GFS3_OP_MKNOD] = { "MKNOD", GFS3_OP_MKNOD, server_mknod, NULL, NULL, 0}, - [GFS3_OP_MKDIR] = { "MKDIR", GFS3_OP_MKDIR, server_mkdir, NULL, NULL, 0}, - [GFS3_OP_UNLINK] = { "UNLINK", GFS3_OP_UNLINK, server_unlink, NULL, NULL, 0}, - [GFS3_OP_RMDIR] = { "RMDIR", GFS3_OP_RMDIR, server_rmdir, NULL, NULL, 0}, - [GFS3_OP_SYMLINK] = { "SYMLINK", GFS3_OP_SYMLINK, server_symlink, NULL, NULL, 0}, - [GFS3_OP_RENAME] = { "RENAME", GFS3_OP_RENAME, server_rename, NULL, NULL, 0}, - [GFS3_OP_LINK] = { "LINK", GFS3_OP_LINK, server_link, NULL, NULL, 0}, - [GFS3_OP_TRUNCATE] = { "TRUNCATE", GFS3_OP_TRUNCATE, server_truncate, NULL, NULL, 0}, - [GFS3_OP_OPEN] = { "OPEN", GFS3_OP_OPEN, server_open, NULL, NULL, 0}, - [GFS3_OP_READ] = { "READ", GFS3_OP_READ, server_readv, NULL, NULL, 0}, - [GFS3_OP_WRITE] = { "WRITE", GFS3_OP_WRITE, server_writev, server_writev_vec, server_writev_vecsizer, 0}, - [GFS3_OP_STATFS] = { "STATFS", GFS3_OP_STATFS, server_statfs, NULL, NULL, 0}, - [GFS3_OP_FLUSH] = { "FLUSH", GFS3_OP_FLUSH, server_flush, NULL, NULL, 0}, - [GFS3_OP_FSYNC] = { "FSYNC", GFS3_OP_FSYNC, server_fsync, NULL, NULL, 0}, - [GFS3_OP_SETXATTR] = { "SETXATTR", GFS3_OP_SETXATTR, server_setxattr, NULL, NULL, 0}, - [GFS3_OP_GETXATTR] = { "GETXATTR", GFS3_OP_GETXATTR, server_getxattr, NULL, NULL, 0}, - [GFS3_OP_REMOVEXATTR] = { "REMOVEXATTR", GFS3_OP_REMOVEXATTR, server_removexattr, NULL, NULL, 0}, - [GFS3_OP_OPENDIR] = { "OPENDIR", GFS3_OP_OPENDIR, server_opendir, NULL, NULL, 0}, - [GFS3_OP_FSYNCDIR] = { "FSYNCDIR", GFS3_OP_FSYNCDIR, server_fsyncdir, NULL, NULL, 0}, - [GFS3_OP_ACCESS] = { "ACCESS", GFS3_OP_ACCESS, server_access, NULL, NULL, 0}, - [GFS3_OP_CREATE] = { "CREATE", GFS3_OP_CREATE, server_create, NULL, NULL, 0}, - [GFS3_OP_FTRUNCATE] = { "FTRUNCATE", GFS3_OP_FTRUNCATE, server_ftruncate, NULL, NULL, 0}, - [GFS3_OP_FSTAT] = { "FSTAT", GFS3_OP_FSTAT, server_fstat, NULL, NULL, 0}, - [GFS3_OP_LK] = { "LK", GFS3_OP_LK, server_lk, NULL, NULL, 0}, - [GFS3_OP_LOOKUP] = { "LOOKUP", GFS3_OP_LOOKUP, server_lookup, NULL, NULL, 0}, - [GFS3_OP_READDIR] = { "READDIR", GFS3_OP_READDIR, server_readdir, NULL, NULL, 0}, - [GFS3_OP_INODELK] = { "INODELK", GFS3_OP_INODELK, server_inodelk, NULL, NULL, 0}, - [GFS3_OP_FINODELK] = { "FINODELK", GFS3_OP_FINODELK, server_finodelk, NULL, NULL, 0}, - [GFS3_OP_ENTRYLK] = { "ENTRYLK", GFS3_OP_ENTRYLK, server_entrylk, NULL, NULL, 0}, - [GFS3_OP_FENTRYLK] = { "FENTRYLK", GFS3_OP_FENTRYLK, server_fentrylk, NULL, NULL, 0}, - [GFS3_OP_XATTROP] = { "XATTROP", GFS3_OP_XATTROP, server_xattrop, NULL, NULL, 0}, - [GFS3_OP_FXATTROP] = { "FXATTROP", GFS3_OP_FXATTROP, server_fxattrop, NULL, NULL, 0}, - [GFS3_OP_FGETXATTR] = { "FGETXATTR", GFS3_OP_FGETXATTR, server_fgetxattr, NULL, NULL, 0}, - [GFS3_OP_FSETXATTR] = { "FSETXATTR", GFS3_OP_FSETXATTR, server_fsetxattr, NULL, NULL, 0}, - [GFS3_OP_RCHECKSUM] = { "RCHECKSUM", GFS3_OP_RCHECKSUM, server_rchecksum, NULL, NULL, 0}, - [GFS3_OP_SETATTR] = { "SETATTR", GFS3_OP_SETATTR, server_setattr, NULL, NULL, 0}, - [GFS3_OP_FSETATTR] = { "FSETATTR", GFS3_OP_FSETATTR, server_fsetattr, NULL, NULL, 0}, - [GFS3_OP_READDIRP] = { "READDIRP", GFS3_OP_READDIRP, server_readdirp, NULL, NULL, 0}, - [GFS3_OP_RELEASE] = { "RELEASE", GFS3_OP_RELEASE, server_release, NULL, NULL, 0}, - [GFS3_OP_RELEASEDIR] = { "RELEASEDIR", GFS3_OP_RELEASEDIR, server_releasedir, NULL, NULL, 0}, - [GFS3_OP_FREMOVEXATTR] = { "FREMOVEXATTR", GFS3_OP_FREMOVEXATTR, server_fremovexattr, NULL, NULL, 0}, + [GFS3_OP_STAT] = { "STAT", GFS3_OP_STAT, server3_3_stat, NULL, NULL, 0}, + [GFS3_OP_READLINK] = { "READLINK", GFS3_OP_READLINK, server3_3_readlink, NULL, NULL, 0}, + [GFS3_OP_MKNOD] = { "MKNOD", GFS3_OP_MKNOD, server3_3_mknod, NULL, NULL, 0}, + [GFS3_OP_MKDIR] = { "MKDIR", GFS3_OP_MKDIR, server3_3_mkdir, NULL, NULL, 0}, + [GFS3_OP_UNLINK] = { "UNLINK", GFS3_OP_UNLINK, server3_3_unlink, NULL, NULL, 0}, + [GFS3_OP_RMDIR] = { "RMDIR", GFS3_OP_RMDIR, server3_3_rmdir, NULL, NULL, 0}, + [GFS3_OP_SYMLINK] = { "SYMLINK", GFS3_OP_SYMLINK, server3_3_symlink, NULL, NULL, 0}, + [GFS3_OP_RENAME] = { "RENAME", GFS3_OP_RENAME, server3_3_rename, NULL, NULL, 0}, + [GFS3_OP_LINK] = { "LINK", GFS3_OP_LINK, server3_3_link, NULL, NULL, 0}, + [GFS3_OP_TRUNCATE] = { "TRUNCATE", GFS3_OP_TRUNCATE, server3_3_truncate, NULL, NULL, 0}, + [GFS3_OP_OPEN] = { "OPEN", GFS3_OP_OPEN, server3_3_open, NULL, NULL, 0}, + [GFS3_OP_READ] = { "READ", GFS3_OP_READ, server3_3_readv, NULL, NULL, 0}, + [GFS3_OP_WRITE] = { "WRITE", GFS3_OP_WRITE, server3_3_writev, server3_3_writev_vec, server3_3_writev_vecsizer, 0}, + [GFS3_OP_STATFS] = { "STATFS", GFS3_OP_STATFS, server3_3_statfs, NULL, NULL, 0}, + [GFS3_OP_FLUSH] = { "FLUSH", GFS3_OP_FLUSH, server3_3_flush, NULL, NULL, 0}, + [GFS3_OP_FSYNC] = { "FSYNC", GFS3_OP_FSYNC, server3_3_fsync, NULL, NULL, 0}, + [GFS3_OP_SETXATTR] = { "SETXATTR", GFS3_OP_SETXATTR, server3_3_setxattr, NULL, NULL, 0}, + [GFS3_OP_GETXATTR] = { "GETXATTR", GFS3_OP_GETXATTR, server3_3_getxattr, NULL, NULL, 0}, + [GFS3_OP_REMOVEXATTR] = { "REMOVEXATTR", GFS3_OP_REMOVEXATTR, server3_3_removexattr, NULL, NULL, 0}, + [GFS3_OP_OPENDIR] = { "OPENDIR", GFS3_OP_OPENDIR, server3_3_opendir, NULL, NULL, 0}, + [GFS3_OP_FSYNCDIR] = { "FSYNCDIR", GFS3_OP_FSYNCDIR, server3_3_fsyncdir, NULL, NULL, 0}, + [GFS3_OP_ACCESS] = { "ACCESS", GFS3_OP_ACCESS, server3_3_access, NULL, NULL, 0}, + [GFS3_OP_CREATE] = { "CREATE", GFS3_OP_CREATE, server3_3_create, NULL, NULL, 0}, + [GFS3_OP_FTRUNCATE] = { "FTRUNCATE", GFS3_OP_FTRUNCATE, server3_3_ftruncate, NULL, NULL, 0}, + [GFS3_OP_FSTAT] = { "FSTAT", GFS3_OP_FSTAT, server3_3_fstat, NULL, NULL, 0}, + [GFS3_OP_LK] = { "LK", GFS3_OP_LK, server3_3_lk, NULL, NULL, 0}, + [GFS3_OP_LOOKUP] = { "LOOKUP", GFS3_OP_LOOKUP, server3_3_lookup, NULL, NULL, 0}, + [GFS3_OP_READDIR] = { "READDIR", GFS3_OP_READDIR, server3_3_readdir, NULL, NULL, 0}, + [GFS3_OP_INODELK] = { "INODELK", GFS3_OP_INODELK, server3_3_inodelk, NULL, NULL, 0}, + [GFS3_OP_FINODELK] = { "FINODELK", GFS3_OP_FINODELK, server3_3_finodelk, NULL, NULL, 0}, + [GFS3_OP_ENTRYLK] = { "ENTRYLK", GFS3_OP_ENTRYLK, server3_3_entrylk, NULL, NULL, 0}, + [GFS3_OP_FENTRYLK] = { "FENTRYLK", GFS3_OP_FENTRYLK, server3_3_fentrylk, NULL, NULL, 0}, + [GFS3_OP_XATTROP] = { "XATTROP", GFS3_OP_XATTROP, server3_3_xattrop, NULL, NULL, 0}, + [GFS3_OP_FXATTROP] = { "FXATTROP", GFS3_OP_FXATTROP, server3_3_fxattrop, NULL, NULL, 0}, + [GFS3_OP_FGETXATTR] = { "FGETXATTR", GFS3_OP_FGETXATTR, server3_3_fgetxattr, NULL, NULL, 0}, + [GFS3_OP_FSETXATTR] = { "FSETXATTR", GFS3_OP_FSETXATTR, server3_3_fsetxattr, NULL, NULL, 0}, + [GFS3_OP_RCHECKSUM] = { "RCHECKSUM", GFS3_OP_RCHECKSUM, server3_3_rchecksum, NULL, NULL, 0}, + [GFS3_OP_SETATTR] = { "SETATTR", GFS3_OP_SETATTR, server3_3_setattr, NULL, NULL, 0}, + [GFS3_OP_FSETATTR] = { "FSETATTR", GFS3_OP_FSETATTR, server3_3_fsetattr, NULL, NULL, 0}, + [GFS3_OP_READDIRP] = { "READDIRP", GFS3_OP_READDIRP, server3_3_readdirp, NULL, NULL, 0}, + [GFS3_OP_RELEASE] = { "RELEASE", GFS3_OP_RELEASE, server3_3_release, NULL, NULL, 0}, + [GFS3_OP_RELEASEDIR] = { "RELEASEDIR", GFS3_OP_RELEASEDIR, server3_3_releasedir, NULL, NULL, 0}, + [GFS3_OP_FREMOVEXATTR] = { "FREMOVEXATTR", GFS3_OP_FREMOVEXATTR, server3_3_fremovexattr, NULL, NULL, 0}, }; -struct rpcsvc_program glusterfs3_1_fop_prog = { - .progname = "GlusterFS " PACKAGE_VERSION, - .prognum = GLUSTER3_1_FOP_PROGRAM, - .progver = GLUSTER3_1_FOP_VERSION, - .numactors = GLUSTER3_1_FOP_PROCCNT, - .actors = glusterfs3_1_fop_actors, +struct rpcsvc_program glusterfs3_3_fop_prog = { + .progname = "GlusterFS 3.3", + .prognum = GLUSTER_FOP_PROGRAM, + .progver = GLUSTER_FOP_VERSION, + .numactors = GLUSTER_FOP_PROCCNT, + .actors = glusterfs3_3_fop_actors, }; diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index a99ba817..b7612e01 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -1023,14 +1023,14 @@ init (xlator_t *this) goto out; } - glusterfs3_1_fop_prog.options = this->options; - ret = rpcsvc_program_register (conf->rpc, &glusterfs3_1_fop_prog); + glusterfs3_3_fop_prog.options = this->options; + ret = rpcsvc_program_register (conf->rpc, &glusterfs3_3_fop_prog); if (ret) { gf_log (this->name, GF_LOG_WARNING, "registration of program (name:%s, prognum:%d, " - "progver:%d) failed", glusterfs3_1_fop_prog.progname, - glusterfs3_1_fop_prog.prognum, - glusterfs3_1_fop_prog.progver); + "progver:%d) failed", glusterfs3_3_fop_prog.progname, + glusterfs3_3_fop_prog.prognum, + glusterfs3_3_fop_prog.progver); goto out; } @@ -1042,7 +1042,7 @@ init (xlator_t *this) "progver:%d) failed", gluster_handshake_prog.progname, gluster_handshake_prog.prognum, gluster_handshake_prog.progver); - rpcsvc_program_unregister (conf->rpc, &glusterfs3_1_fop_prog); + rpcsvc_program_unregister (conf->rpc, &glusterfs3_3_fop_prog); goto out; } diff --git a/xlators/protocol/server/src/server.h b/xlators/protocol/server/src/server.h index ee5f8773..f3b97891 100644 --- a/xlators/protocol/server/src/server.h +++ b/xlators/protocol/server/src/server.h @@ -203,7 +203,7 @@ struct _server_state { }; extern struct rpcsvc_program gluster_handshake_prog; -extern struct rpcsvc_program glusterfs3_1_fop_prog; +extern struct rpcsvc_program glusterfs3_3_fop_prog; extern struct rpcsvc_program gluster_ping_prog; int |