From 797c62eb56797189b51a1dcb35009499f920a3ea Mon Sep 17 00:00:00 2001 From: Krutika Dhananjay Date: Sat, 1 Feb 2014 22:49:22 +0530 Subject: glusterd: Reset opinfo.op ONLY if lock succeeded Change-Id: I0244a7f61a826b32f4c2dfe51e246f2593a38211 BUG: 1060434 Signed-off-by: Krutika Dhananjay Reviewed-on: http://review.gluster.org/6885 Reviewed-by: Kaushal M Reviewed-by: Krishnan Parthasarathi Tested-by: Gluster Build System --- xlators/mgmt/glusterd/src/glusterd-syncop.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'xlators/mgmt/glusterd/src') diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c index c975d01f1..c9a1b5a75 100644 --- a/xlators/mgmt/glusterd/src/glusterd-syncop.c +++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c @@ -1099,9 +1099,11 @@ gd_unlock_op_phase (struct list_head *peers, glusterd_op_t op, int op_ret, out: glusterd_op_send_cli_response (op, op_ret, 0, req, op_ctx, op_errstr); - glusterd_op_clear_op (op); - if (is_locked) + /* Unlock and reset opinfo.op ONLY if lock ever succeeded! */ + if (is_locked) { + glusterd_op_clear_op (op); glusterd_unlock (MY_UUID); + } return 0; } -- cgit