From a4f84d786b596387aa0d659fb5cc8a933c95c01b Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Tue, 15 Mar 2016 06:16:31 -0400 Subject: glusterd: default value of nfs.disable, change from false to true Next step in eventual deprecation of glusterfs nfs server in favor of ganesha.nfsd. Also replace several open-coded strings with constant. Change-Id: If52f5e880191a14fd38e69b70a32b0300dd93a50 BUG: 1092414 Signed-off-by: Kaleb S KEITHLEY Reviewed-on: http://review.gluster.org/13738 NetBSD-regression: NetBSD Build System Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Atin Mukherjee Tested-by: Atin Mukherjee Reviewed-by: Niels de Vos --- xlators/mgmt/glusterd/src/glusterd-svc-helper.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-svc-helper.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c index 7cb44ba688f..44ee6d08d68 100644 --- a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c +++ b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c @@ -183,15 +183,11 @@ glusterd_svc_check_volfile_identical (char *svc_name, need_unlink = 1; - ret = glusterd_create_global_volfile (builder, - tmpvol, NULL); + ret = glusterd_create_global_volfile (builder, tmpvol, NULL); if (ret) goto out; - ret = glusterd_check_files_identical (orgvol, tmpvol, - identical); - if (ret) - goto out; + ret = glusterd_check_files_identical (orgvol, tmpvol, identical); out: if (need_unlink) -- cgit