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-helpers.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'xlators/protocol/server/src/server-helpers.c') diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index 126185321c8..380e47216bd 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -745,16 +745,15 @@ server_alloc_frame (rpcsvc_request_t *req) server_connection_t *conn = NULL; GF_VALIDATE_OR_GOTO("server", req, out); - GF_VALIDATE_OR_GOTO("server", req->conn, out); - GF_VALIDATE_OR_GOTO("server", req->conn->trans, out); - GF_VALIDATE_OR_GOTO("server", req->conn->svc, out); - GF_VALIDATE_OR_GOTO("server", req->conn->svc->ctx, out); + GF_VALIDATE_OR_GOTO("server", req->trans, out); + GF_VALIDATE_OR_GOTO("server", req->svc, out); + GF_VALIDATE_OR_GOTO("server", req->svc->ctx, out); - conn = (server_connection_t *)req->conn->trans->xl_private; + conn = (server_connection_t *)req->trans->xl_private; if (!conn) goto out; - frame = create_frame (conn->this, req->conn->svc->ctx->pool); + frame = create_frame (conn->this, req->svc->ctx->pool); GF_VALIDATE_OR_GOTO("server", frame, out); state = GF_CALLOC (1, sizeof (*state), gf_server_mt_state_t); @@ -763,7 +762,7 @@ server_alloc_frame (rpcsvc_request_t *req) if (conn->bound_xl) state->itable = conn->bound_xl->itable; - state->xprt = req->conn->trans; + state->xprt = req->trans; state->conn = conn; state->resolve.fd_no = -1; -- cgit