From 4e01a54eaa6da1bd6817d62dcc51a75e22699e2b Mon Sep 17 00:00:00 2001 From: Raghavendra G Date: Tue, 17 Aug 2010 05:35:42 +0000 Subject: rpc - cleanup and changes related to rdma - remove rpc_conn_state structure. - add a member to point struct rpc_req in rpc_transport_req structure. This is needed for rdma to store rdma specific per request data. Signed-off-by: Raghavendra G Signed-off-by: Anand V. Avati BUG: 875 (Implement a new protocol to provide proper backward/forward compatibility) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=875 --- xlators/protocol/server/src/server-handshake.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'xlators/protocol/server/src/server-handshake.c') diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c index 68964883836..357160c7338 100644 --- a/xlators/protocol/server/src/server-handshake.c +++ b/xlators/protocol/server/src/server-handshake.c @@ -260,7 +260,7 @@ server_getspec (rpcsvc_request_t *req) gf_getspec_rsp rsp = {0,}; server_connection_t *conn = NULL; - conn = req->conn->trans->private; + conn = req->trans->private; conf = conn->this->private; if (xdr_to_glusterfs_req (req, &args, xdr_to_getspec_req)) { @@ -359,7 +359,7 @@ server_setvolume (rpcsvc_request_t *req) goto fail; } - this = req->conn->svc->mydata; + this = req->svc->mydata; config_params = dict_copy_with_ref (this->options, NULL); conf = this->private; @@ -395,8 +395,8 @@ server_setvolume (rpcsvc_request_t *req) conn = server_connection_get (this, process_uuid); - if (req->conn->trans->xl_private != conn) - req->conn->trans->xl_private = conn; + if (req->trans->xl_private != conn) + req->trans->xl_private = conn; ret = dict_get_int32 (params, "fops-version", &fop_version); if (ret < 0) { @@ -497,7 +497,7 @@ server_setvolume (rpcsvc_request_t *req) } - peerinfo = &req->conn->trans->peerinfo; + peerinfo = &req->trans->peerinfo; if (peerinfo) { ret = dict_set_static_ptr (params, "peer-info", peerinfo); if (ret < 0) @@ -572,7 +572,7 @@ server_setvolume (rpcsvc_request_t *req) "failed to set 'process-uuid'"); ret = dict_set_uint64 (reply, "transport-ptr", - ((uint64_t) (long) req->conn->trans)); + ((uint64_t) (long) req->trans)); if (ret) gf_log (this->name, GF_LOG_DEBUG, "failed to set 'transport-ptr'"); -- cgit