diff options
| author | Kaleb S KEITHLEY <kkeithle@redhat.com> | 2016-03-15 06:16:31 -0400 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2016-04-27 00:59:30 -0700 |
| commit | a4f84d786b596387aa0d659fb5cc8a933c95c01b (patch) | |
| tree | 85e0f319cf0405a632c5a268dfb25407c054dba8 /xlators/mgmt/glusterd/src/glusterd-svc-helper.c | |
| parent | 3c35329feb4dd479c9e4856ee27fa4b12c708db2 (diff) | |
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 <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/13738
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-svc-helper.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-svc-helper.c | 8 |
1 files changed, 2 insertions, 6 deletions
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) |