From 1b096c3ff0a4c25ff22a32d9594d2e289a3d67ea Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Fri, 23 Sep 2011 16:19:20 +0530 Subject: glusterd-volgen: prevent a crash when volume type is stripe-replicate when volgen tries to check for decommissioned nodes, a check for stripe replicate volume was missed Change-Id: Ie3aa97da2ec0d94fcf65f96bb4006b3fb54f59dc BUG: 3616 Reviewed-on: http://review.gluster.com/494 Tested-by: Gluster Build System Reviewed-by: Krishnan Parthasarathi --- xlators/mgmt/glusterd/src/glusterd-volgen.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 6320bf17ecc..77478f3658e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -2013,7 +2013,9 @@ _xl_has_decommissioned_clients (xlator_t *xl, glusterd_volinfo_t *volinfo) xl_child = xl->children; while (xl_child) { cxl = xl_child->xlator; - decommissioned = _xl_is_client_decommissioned (cxl, volinfo); + /* this can go into 2 depths if the volume type + is stripe-replicate */ + decommissioned = _xl_has_decommissioned_clients (cxl, volinfo); if (decommissioned) break; -- cgit