From 4684cc67accdffd3d999d1528f6306e2b98b0654 Mon Sep 17 00:00:00 2001 From: Rajesh Joseph Date: Fri, 28 Mar 2014 18:32:26 +0530 Subject: glusterd/snapshot: fixed review comment for upstream restsore code cleanup Change-Id: I4965cc6fb9f8310cb1075047175f5e1139dd2aea Signed-off-by: Rajesh Joseph Reviewed-on: http://review.gluster.org/7366 Reviewed-by: Avra Sengupta --- xlators/mgmt/glusterd/src/glusterd-volgen.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 621e2fda9..b104971d8 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -3178,8 +3178,7 @@ glusterd_generate_brick_volfile (glusterd_volinfo_t *volinfo, static int glusterd_generate_snap_brick_volfile (glusterd_volinfo_t *volinfo, glusterd_brickinfo_t *brickinfo, - glusterd_volinfo_t *snap_volinfo, - gf_boolean_t vol_restore) + glusterd_volinfo_t *snap_volinfo) { volgen_graph_t graph = {0,}; char filename[PATH_MAX] = {0,}; @@ -3193,15 +3192,7 @@ glusterd_generate_snap_brick_volfile (glusterd_volinfo_t *volinfo, GF_ASSERT (brickinfo); GLUSTERD_REMOVE_SLASH_FROM_PATH (brickinfo->path, brick); - /* If the brick volfile is generated as part of a restore - * operation then we should be generating the brick volfile - * in the origin volume folder instead of snap volume folder. - */ - if (vol_restore) { - GLUSTERD_GET_VOLUME_DIR (path, volinfo, priv); - } else { - GLUSTERD_GET_VOLUME_DIR (path, snap_volinfo, priv); - } + GLUSTERD_GET_VOLUME_DIR (path, snap_volinfo, priv); snprintf (filename, PATH_MAX, "%s/%s.%s.%s.vol", path, snap_volinfo->volname, @@ -3299,8 +3290,7 @@ generate_snap_brick_volfiles (glusterd_volinfo_t *volinfo, ret = glusterd_generate_snap_brick_volfile (volinfo, brickinfo, - snap_volinfo, - _gf_false); + snap_volinfo); if (ret) goto out; } -- cgit