From d98c3e19342be3b8b3e2c7e3d7e544de34143bdf Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Mon, 19 Mar 2012 18:10:34 +0530 Subject: rpc-clnt: separate out connection_cleanup() from destroy() noticed that there are possibilities where one would like to do a connection_cleanup() before destroying a RPC connection itself, also current code is such that, rpc_clnt_connection_cleanup() does rpc_clnt_ref() and unref(), creating a race window/double unref possibilities in the code. by separating out the functions, this race window/double fault can be prevented. Change-Id: I7ebd3392efa891232857b6db9108b0b19e40fc12 Signed-off-by: Amar Tumballi BUG: 802403 Reviewed-on: http://review.gluster.com/2979 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- glusterfsd/src/glusterfsd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'glusterfsd/src') diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 68c51162101..053a7c2461a 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -815,8 +815,11 @@ cleanup_and_exit (int signum) exit (0); #if 0 /* TODO: Properly do cleanup_and_exit(), with synchronization */ - if (ctx->mgmt) + if (ctx->mgmt) { + /* cleanup the saved-frames before last unref */ + rpc_clnt_connection_cleanup (&ctx->mgmt->conn); rpc_clnt_unref (ctx->mgmt); + } /* call fini() of each xlator */ trav = NULL; -- cgit