diff options
author | Pranith Kumar K <pranithk@gluster.com> | 2012-02-23 14:46:04 +0530 |
---|---|---|
committer | Vijay Bellur <vijay@gluster.com> | 2012-03-01 09:12:10 -0800 |
commit | 86f631f4283cba7185e5b1d5a3be4b9a614ed985 (patch) | |
tree | 04ef089c7de54aec4348e308fda4015e82092123 /xlators/protocol/server/src/server.c | |
parent | f93045296870cb6938d9b4356a4f3198cbebe3ba (diff) |
protocol/server: Make conn object ref-counted
Change-Id: I992a7f8a75edfe7d75afaa1abe0ad45e8f351c8b
BUG: 796581
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Reviewed-on: http://review.gluster.com/2806
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/protocol/server/src/server.c')
-rw-r--r-- | xlators/protocol/server/src/server.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index bfac42a2799..7ac8590a42e 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -41,6 +41,7 @@ grace_time_handler (void *data) { server_connection_t *conn = NULL; xlator_t *this = NULL; + gf_boolean_t cancelled = _gf_false; conn = data; this = conn->this; @@ -50,8 +51,11 @@ grace_time_handler (void *data) gf_log (this->name, GF_LOG_INFO, "grace timer expired"); - server_cancel_conn_timer (this, conn); - server_connection_put (this, conn); + cancelled = server_cancel_conn_timer (this, conn); + if (cancelled) { + server_connection_cleanup (this, conn); + server_conn_unref (conn); + } out: return; } @@ -172,6 +176,8 @@ ret: } if (frame) { + if (frame->root->trans) + server_conn_unref (frame->root->trans); STACK_DESTROY (frame->root); } |