From ba3cf3a90bd9ba9648252f12fcfce4f0a66c3b74 Mon Sep 17 00:00:00 2001 From: Raghavendra Bhat Date: Wed, 15 Jan 2014 17:03:38 +0530 Subject: protocol/server: get the client object from frame->root even in barrier * Remove the reference to client object from server_state_t structure Change-Id: Ic2dbf9dd487f1177bd889fe481e63bc063fd6183 Signed-off-by: Raghavendra Bhat --- xlators/protocol/server/src/server-helpers.c | 3 +-- xlators/protocol/server/src/server.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index a4055f1b8..f0b040c74 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -956,8 +956,7 @@ gf_barrier_transmit (server_conf_t *conf, gf_barrier_payload_t *payload) if (frame) { state = CALL_STATE (frame); frame->local = NULL; - if (state) - client = state->client; + client = frame->root->client; } /* currently lk fops are not barrier'ed. This is reflecting code in * server_submit_reply */ diff --git a/xlators/protocol/server/src/server.h b/xlators/protocol/server/src/server.h index 165058ec3..782327d77 100644 --- a/xlators/protocol/server/src/server.h +++ b/xlators/protocol/server/src/server.h @@ -124,7 +124,6 @@ int resolve_and_resume (call_frame_t *frame, server_resume_fn_t fn); struct _server_state { - struct _client_t *client; rpc_transport_t *xprt; inode_table_t *itable; -- cgit