From 3edfb0c492d73b349d83f904c42e6edfb9678965 Mon Sep 17 00:00:00 2001 From: Krishnan Parthasarathi Date: Mon, 10 Oct 2011 18:44:41 +0530 Subject: glusterd: Removing delayed moving of op sm for stop vol/remove brick op. Earlier we waited for brick disconnect or 5s whichever is smaller, before we move op sm from brick op stage to commit stage. This involves a race where both the above mentioned events can happen 'concurrently' and result in double free. Change-Id: I8b1524afded84c20d55e29cfe2579ca872d2ac26 BUG: 3700 Reviewed-on: http://review.gluster.com/575 Tested-by: Gluster Build System Reviewed-by: Amar Tumballi --- xlators/mgmt/glusterd/src/glusterd.h | 1 - 1 file changed, 1 deletion(-) (limited to 'xlators/mgmt/glusterd/src/glusterd.h') diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index 203f6e97..d59193e7 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -142,7 +142,6 @@ struct glusterd_brickinfo { glusterd_store_handle_t *shandle; gf_brick_status_t status; struct rpc_clnt *rpc; - gf_timer_t *timer; int decommissioned; }; -- cgit