From 4c0efe75411112d6e386fe10a138ec2d9218b8b8 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Wed, 21 Sep 2011 08:12:32 +0530 Subject: mgmt/glusterd: Create volfile in correct path Change-Id: Ie52e4b1a338282f2697e2ce374dd566d2c5cf5d1 BUG: 3586 Reviewed-on: http://review.gluster.com/475 Tested-by: Gluster Build System Reviewed-by: Amar Tumballi --- xlators/mgmt/glusterd/src/glusterd-volgen.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index fe7cfc1d14b..6320bf17ecc 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -2818,19 +2818,13 @@ get_client_filepath (char *filepath, glusterd_volinfo_t *volinfo, gf_transport_t GLUSTERD_GET_VOLUME_DIR (path, volinfo, priv); - switch (type) { - case GF_TRANSPORT_TCP: - snprintf (filepath, PATH_MAX, "%s/%s-fuse.vol", - path, volinfo->volname); - break; - case GF_TRANSPORT_RDMA: + if ((volinfo->transport_type == GF_TRANSPORT_BOTH_TCP_RDMA) && + (type == GF_TRANSPORT_RDMA)) snprintf (filepath, PATH_MAX, "%s/%s.rdma-fuse.vol", path, volinfo->volname); - break; - default: - GF_ASSERT (0); - break; - } + else + snprintf (filepath, PATH_MAX, "%s/%s-fuse.vol", + path, volinfo->volname); } static void -- cgit