diff options
| author | Rajesh Joseph <rjoseph@redhat.com> | 2014-01-20 22:16:30 -0800 |
|---|---|---|
| committer | Gerrit Code Review <review@dev.gluster.org> | 2014-01-20 22:16:30 -0800 |
| commit | a3387fe696dabef8b53d8b790743598d5441e06b (patch) | |
| tree | 4733f2de888667a220dbfdd8327d0dc97e52b26f /xlators | |
| parent | 19a9d8bdfcf86dbe4008d548161ec3d43ee9e978 (diff) | |
| parent | ba3cf3a90bd9ba9648252f12fcfce4f0a66c3b74 (diff) | |
Merge "protocol/server: get the client object from frame->root even in barrier" into development
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/protocol/server/src/server-helpers.c | 3 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server.h | 1 |
2 files changed, 1 insertions, 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; |