Upgrade to glusterfs 3.7.2

Complete list of changes since 3.7.1:
- doc: add 1233044, 1232179 in 3.7.2 release-notes
- features/bitrot: fix fd leak in truncate (stub)
- doc: add release notes for 3.7.2
- libgfchangelog: Fix crash in gf_changelog_process
- glusterd: Fix snapshot of a volume with geo-rep
- cluster/ec: Avoid parallel executions of the same state machine
- quota: fix double accounting with rename operation
- cluster/dht: Prevent use after free bug
- cluster/ec: Wind unlock fops at all cost
- glusterd: Buffer overflow causing crash for glusterd
- NFS-Ganesha: Automatically export vol that was exported before vol restart
- common-ha: cluster HA setup sometimes fails
- cluster/ec: Prevent double unwind
- quota/glusterd: porting to new logging framework.
- bitrot/glusterd: gluster volume set command for bitrot should not supported
- tests: fix spurious failure in bug-857330/xml.t
- features/bitrot: tuanble object signing waiting time value for bitrot
- quota: don't log error when disk quota exceeded
- protocol/client : porting log messages to new framework
- cluster/afr: Do not attempt entry self-heal if the last lookup on entry
  failed on src
- changetimerecorder : port log messages to a new framework
- tier/volume set: Validate volume set option for tier
- glusterd/tier: glusterd crashed with detach-tier commit force
- rebalance,store,glusterd/glusterd: porting to new logging framework.
- libglusterfs: Enabling the fini()  in cleanup_and_exit()
- sm/glusterd: Porting messages to new logging framework
- nfs: Authentication performance improvements
- common-ha: cluster HA setup sometimes fails
- glusterd: subvol_count value for replicate volume should be calculate
  correctly
- common-ha : Clean up cib state completely
- NFS-Ganesha : Return correct return value
- glusterd: Porting messages to new logging framework.
- glusterd: Stop tcp/ip listeners during  glusterd exit
- storage/posix: Handle MAKE_INODE_HANDLE failures
- cluster/ec: Prevent Null dereference in dht-rename
- doc: fix markdown formatting
- upcall: prevent busy loop in reaper thread
- protocol/server : port log messages to a new framework
- nfs.c nfs3.c: port log messages to a new framework
- logging: log "Stale filehandle" on the client as Debug
- snapshot/scheduler: Modified main() function to take arguments.
- tools/glusterfind: print message for good cases
- geo-rep: ignore symlink and harlink errors in geo-rep
- tools/glusterfind: ignoring deleted files
- spec/geo-rep: Add rsync as dependency for georeplication rpm
- features/changelog: Do htime setxattr without XATTR_REPLACE flag
- tools/glusterfind: Cleanup glusterfind dir after a volume delete
- tools/glusterfind: Cleanup session dir after delete
- geo-rep: Validate use_meta_volume option
- spec: correct the vendor string in spec file
- tools/glusterfind: Fix GFID to Path conversion for dir
- libglusterfs: update glfs-message header for reserved segments
- features/qemu-block: Don't unref root inode
- features/changelog: Avoid setattr fop logging during rename
- common-ha: handle long node names and node names with '-' and '.' in them
- features/marker : Pass along xdata to lower translator
- tools/glusterfind: verifying volume is online
- build: fix compiling on older distributions
- snapshot/scheduler: Handle OSError in os. callbacks
- snapshot/scheduler: Check if GCRON_TASKS exists before
- features/quota: Fix ref-leak
- tools/glusterfind: verifying volume presence
- stripe: fix use-after-free
- Upcall/cache-invalidation: Ignore fops with frame->root->client not set
- rpm: correct date and order of entries in the %changelog
- nfs: allocate and return the hashkey for the auth_cache_entry
- doc: add release notes for 3.7.1
- snapshot: Fix finding brick mount path logic
- glusterd/snapshot: Return correct errno in events of failure - PATCH 2
- rpc: call transport_unref only on non-NULL transport
- heal : Do not invoke glfs_fini for glfs-heal commands
- Changing log level from Warning to Debug
- features/shard: Handle symlinks appropriately in fops
- cluster/ec: EC_XATTR_DIRTY doesn't come in response
- worm: Let lock, zero xattrop calls succeed
- bitrot/glusterd: scrub option should be disabled once bitrot option is
  reset
- glusterd/shared_storage: Provide a volume set option to create and mount
  the shared storage
- dht: Add lookup-optimize configuration option for DHT
- glusterfs.spec.in: move libgf{db,changelog}.pc from -api-devel to -devel
- fuse: squash 64-bit inodes in readdirp when enable-ino32 is set
- glusterd: do not show pid of brick in volume status if brick is down.
- cluster/dht: fix incorrect dst subvol info in inode_ctx
- common-ha: fix race between setting grace and virt IP fail-over
- heal: Do not call glfs_fini in final builds
- dht/rebalance : Fixed rebalance failure
- cluster/dht: Fix dht_setxattr to follow files under migration
- meta: implement fsync(dir)
- socket: throttle only connected transport
- contrib/timer-wheel: fix deadlock in del_timer()
- snapshot/scheduler: Return proper error code in case of failure
- quota: retry connecting to quotad on ENOTCONN error
- features/quota: prevent statfs frame loss when an error happens during
  ancestry
- features/quota : Make "quota-deem-statfs" option "on" by default, when
  quota is  enabled
- cluster/dht: pass a destination subvol to fop2 variants to avoid races.
- cli: Fix incorrect parse logic for volume heal commands
- glusterd: Bump op version and max op version for 3.7.2
- cluster/dht: Don't rely on linkto xattr to find destination subvol
- afr: honour selfheal enable/disable volume set options
- features/shard: Fix incorrect parameter to get_lowest_block()
- libglusterfs: Copy d_len and dict as well into dst dirent
- features/quota : Do unwind if postbuf is NULL
- cluster/ec: Fix incorrect check for iatt differences
- features/shard: Fix issue with readdir(p) fop
- glusterfs.spec.in: python-gluster should be 'noarch'
- glusterd: Bump op version and max op version for 3.7.1
- glusterd: fix repeated connection to nfssvc failed msgs

4 files changed, 85 insertions, 196 deletions

diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index 895ccc0691a..cd62153e16e 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2015/06/02 03:44:16 manu Exp $
+# $NetBSD: Makefile,v 1.52 2015/06/20 03:43:04 manu Exp $
 
-DISTNAME=	glusterfs-3.7.1
-PKGREVISION=	1
+DISTNAME=	glusterfs-3.7.2
+#PKGREVISION=	1
 CATEGORIES=	filesystems
 MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
 
diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST
index b8d9f9722d4..c8acf801fa2 100644
--- a/filesystems/glusterfs/PLIST
+++ b/filesystems/glusterfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2015/06/02 03:44:16 manu Exp $
+@comment $NetBSD: PLIST,v 1.25 2015/06/20 03:43:04 manu Exp $
 ${PYSITELIB}/gluster/__init__.py
 ${PYSITELIB}/gluster/__init__.pyc
 ${PYSITELIB}/gluster/__init__.pyo
@@ -22,83 +22,83 @@ include/glusterfs/gfdb/gfdb_data_store_types.h
 include/glusterfs/gfdb/gfdb_mem-types.h
 include/glusterfs/gfdb/gfdb_sqlite3.h
 include/glusterfs/gfdb/gfdb_sqlite3_helper.c
-lib/glusterfs/3.7.1/auth/addr.la
-lib/glusterfs/3.7.1/auth/login.la
-lib/glusterfs/3.7.1/rpc-transport/socket.la
-lib/glusterfs/3.7.1/xlator/cluster/afr.la
-lib/glusterfs/3.7.1/xlator/cluster/dht.la
-lib/glusterfs/3.7.1/xlator/cluster/disperse.so
-lib/glusterfs/3.7.1/xlator/cluster/distribute.so
-lib/glusterfs/3.7.1/xlator/cluster/ec.la
-lib/glusterfs/3.7.1/xlator/cluster/nufa.la
-lib/glusterfs/3.7.1/xlator/cluster/pump.la
-lib/glusterfs/3.7.1/xlator/cluster/replicate.so
-lib/glusterfs/3.7.1/xlator/cluster/stripe.la
-lib/glusterfs/3.7.1/xlator/cluster/switch.la
-lib/glusterfs/3.7.1/xlator/cluster/tier.la
-lib/glusterfs/3.7.1/xlator/debug/error-gen.la
-lib/glusterfs/3.7.1/xlator/debug/io-stats.la
-lib/glusterfs/3.7.1/xlator/debug/trace.la
-lib/glusterfs/3.7.1/xlator/encryption/crypt.la
-lib/glusterfs/3.7.1/xlator/encryption/rot-13.la
-lib/glusterfs/3.7.1/xlator/features/access-control.so
-lib/glusterfs/3.7.1/xlator/features/arbiter.la
-lib/glusterfs/3.7.1/xlator/features/barrier.la
-lib/glusterfs/3.7.1/xlator/features/bit-rot.la
-lib/glusterfs/3.7.1/xlator/features/bitrot-stub.la
-lib/glusterfs/3.7.1/xlator/features/cdc.la
-lib/glusterfs/3.7.1/xlator/features/changelog.la
-lib/glusterfs/3.7.1/xlator/features/changetimerecorder.la
-lib/glusterfs/3.7.1/xlator/features/ganesha.la
-lib/glusterfs/3.7.1/xlator/features/gfid-access.la
-lib/glusterfs/3.7.1/xlator/features/glupy.la
-lib/glusterfs/3.7.1/xlator/features/glupy/debug-trace.py
-lib/glusterfs/3.7.1/xlator/features/glupy/debug-trace.pyc
-lib/glusterfs/3.7.1/xlator/features/glupy/debug-trace.pyo
-lib/glusterfs/3.7.1/xlator/features/glupy/helloworld.py
-lib/glusterfs/3.7.1/xlator/features/glupy/helloworld.pyc
-lib/glusterfs/3.7.1/xlator/features/glupy/helloworld.pyo
-lib/glusterfs/3.7.1/xlator/features/glupy/negative.py
-lib/glusterfs/3.7.1/xlator/features/glupy/negative.pyc
-lib/glusterfs/3.7.1/xlator/features/glupy/negative.pyo
-lib/glusterfs/3.7.1/xlator/features/index.la
-lib/glusterfs/3.7.1/xlator/features/locks.la
-lib/glusterfs/3.7.1/xlator/features/mac-compat.la
-lib/glusterfs/3.7.1/xlator/features/marker.la
-lib/glusterfs/3.7.1/xlator/features/posix-locks.so
-lib/glusterfs/3.7.1/xlator/features/prot_client.la
-lib/glusterfs/3.7.1/xlator/features/prot_dht.la
-lib/glusterfs/3.7.1/xlator/features/prot_server.la
-lib/glusterfs/3.7.1/xlator/features/quiesce.la
-lib/glusterfs/3.7.1/xlator/features/quota.la
-lib/glusterfs/3.7.1/xlator/features/quotad.la
-lib/glusterfs/3.7.1/xlator/features/read-only.la
-lib/glusterfs/3.7.1/xlator/features/shard.la
-lib/glusterfs/3.7.1/xlator/features/snapview-client.la
-lib/glusterfs/3.7.1/xlator/features/snapview-server.la
-lib/glusterfs/3.7.1/xlator/features/trash.la
-lib/glusterfs/3.7.1/xlator/features/upcall.la
-lib/glusterfs/3.7.1/xlator/features/worm.la
-lib/glusterfs/3.7.1/xlator/meta.la
-lib/glusterfs/3.7.1/xlator/mgmt/glusterd.la
-lib/glusterfs/3.7.1/xlator/mount/api.la
-lib/glusterfs/3.7.1/xlator/mount/fuse.la
-lib/glusterfs/3.7.1/xlator/nfs/server.la
-lib/glusterfs/3.7.1/xlator/performance/io-cache.la
-lib/glusterfs/3.7.1/xlator/performance/io-threads.la
-lib/glusterfs/3.7.1/xlator/performance/md-cache.la
-lib/glusterfs/3.7.1/xlator/performance/open-behind.la
-lib/glusterfs/3.7.1/xlator/performance/quick-read.la
-lib/glusterfs/3.7.1/xlator/performance/read-ahead.la
-lib/glusterfs/3.7.1/xlator/performance/readdir-ahead.la
-lib/glusterfs/3.7.1/xlator/performance/stat-prefetch.so
-lib/glusterfs/3.7.1/xlator/performance/write-behind.la
-lib/glusterfs/3.7.1/xlator/protocol/client.la
-lib/glusterfs/3.7.1/xlator/protocol/server.la
-lib/glusterfs/3.7.1/xlator/storage/posix.la
-lib/glusterfs/3.7.1/xlator/system/posix-acl.la
-lib/glusterfs/3.7.1/xlator/testing/features/template.la
-lib/glusterfs/3.7.1/xlator/testing/performance/symlink-cache.la
+lib/glusterfs/3.7.2/auth/addr.la
+lib/glusterfs/3.7.2/auth/login.la
+lib/glusterfs/3.7.2/rpc-transport/socket.la
+lib/glusterfs/3.7.2/xlator/cluster/afr.la
+lib/glusterfs/3.7.2/xlator/cluster/dht.la
+lib/glusterfs/3.7.2/xlator/cluster/disperse.so
+lib/glusterfs/3.7.2/xlator/cluster/distribute.so
+lib/glusterfs/3.7.2/xlator/cluster/ec.la
+lib/glusterfs/3.7.2/xlator/cluster/nufa.la
+lib/glusterfs/3.7.2/xlator/cluster/pump.la
+lib/glusterfs/3.7.2/xlator/cluster/replicate.so
+lib/glusterfs/3.7.2/xlator/cluster/stripe.la
+lib/glusterfs/3.7.2/xlator/cluster/switch.la
+lib/glusterfs/3.7.2/xlator/cluster/tier.la
+lib/glusterfs/3.7.2/xlator/debug/error-gen.la
+lib/glusterfs/3.7.2/xlator/debug/io-stats.la
+lib/glusterfs/3.7.2/xlator/debug/trace.la
+lib/glusterfs/3.7.2/xlator/encryption/crypt.la
+lib/glusterfs/3.7.2/xlator/encryption/rot-13.la
+lib/glusterfs/3.7.2/xlator/features/access-control.so
+lib/glusterfs/3.7.2/xlator/features/arbiter.la
+lib/glusterfs/3.7.2/xlator/features/barrier.la
+lib/glusterfs/3.7.2/xlator/features/bit-rot.la
+lib/glusterfs/3.7.2/xlator/features/bitrot-stub.la
+lib/glusterfs/3.7.2/xlator/features/cdc.la
+lib/glusterfs/3.7.2/xlator/features/changelog.la
+lib/glusterfs/3.7.2/xlator/features/changetimerecorder.la
+lib/glusterfs/3.7.2/xlator/features/ganesha.la
+lib/glusterfs/3.7.2/xlator/features/gfid-access.la
+lib/glusterfs/3.7.2/xlator/features/glupy.la
+lib/glusterfs/3.7.2/xlator/features/glupy/debug-trace.py
+lib/glusterfs/3.7.2/xlator/features/glupy/debug-trace.pyc
+lib/glusterfs/3.7.2/xlator/features/glupy/debug-trace.pyo
+lib/glusterfs/3.7.2/xlator/features/glupy/helloworld.py
+lib/glusterfs/3.7.2/xlator/features/glupy/helloworld.pyc
+lib/glusterfs/3.7.2/xlator/features/glupy/helloworld.pyo
+lib/glusterfs/3.7.2/xlator/features/glupy/negative.py
+lib/glusterfs/3.7.2/xlator/features/glupy/negative.pyc
+lib/glusterfs/3.7.2/xlator/features/glupy/negative.pyo
+lib/glusterfs/3.7.2/xlator/features/index.la
+lib/glusterfs/3.7.2/xlator/features/locks.la
+lib/glusterfs/3.7.2/xlator/features/mac-compat.la
+lib/glusterfs/3.7.2/xlator/features/marker.la
+lib/glusterfs/3.7.2/xlator/features/posix-locks.so
+lib/glusterfs/3.7.2/xlator/features/prot_client.la
+lib/glusterfs/3.7.2/xlator/features/prot_dht.la
+lib/glusterfs/3.7.2/xlator/features/prot_server.la
+lib/glusterfs/3.7.2/xlator/features/quiesce.la
+lib/glusterfs/3.7.2/xlator/features/quota.la
+lib/glusterfs/3.7.2/xlator/features/quotad.la
+lib/glusterfs/3.7.2/xlator/features/read-only.la
+lib/glusterfs/3.7.2/xlator/features/shard.la
+lib/glusterfs/3.7.2/xlator/features/snapview-client.la
+lib/glusterfs/3.7.2/xlator/features/snapview-server.la
+lib/glusterfs/3.7.2/xlator/features/trash.la
+lib/glusterfs/3.7.2/xlator/features/upcall.la
+lib/glusterfs/3.7.2/xlator/features/worm.la
+lib/glusterfs/3.7.2/xlator/meta.la
+lib/glusterfs/3.7.2/xlator/mgmt/glusterd.la
+lib/glusterfs/3.7.2/xlator/mount/api.la
+lib/glusterfs/3.7.2/xlator/mount/fuse.la
+lib/glusterfs/3.7.2/xlator/nfs/server.la
+lib/glusterfs/3.7.2/xlator/performance/io-cache.la
+lib/glusterfs/3.7.2/xlator/performance/io-threads.la
+lib/glusterfs/3.7.2/xlator/performance/md-cache.la
+lib/glusterfs/3.7.2/xlator/performance/open-behind.la
+lib/glusterfs/3.7.2/xlator/performance/quick-read.la
+lib/glusterfs/3.7.2/xlator/performance/read-ahead.la
+lib/glusterfs/3.7.2/xlator/performance/readdir-ahead.la
+lib/glusterfs/3.7.2/xlator/performance/stat-prefetch.so
+lib/glusterfs/3.7.2/xlator/performance/write-behind.la
+lib/glusterfs/3.7.2/xlator/protocol/client.la
+lib/glusterfs/3.7.2/xlator/protocol/server.la
+lib/glusterfs/3.7.2/xlator/storage/posix.la
+lib/glusterfs/3.7.2/xlator/system/posix-acl.la
+lib/glusterfs/3.7.2/xlator/testing/features/template.la
+lib/glusterfs/3.7.2/xlator/testing/performance/symlink-cache.la
 lib/libgfapi.la
 lib/libgfchangelog.la
 lib/libgfdb.la
diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo
index fac452717b4..7f9ba5b920a 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.39 2015/06/08 13:40:08 joerg Exp $
+$NetBSD: distinfo,v 1.40 2015/06/20 03:43:04 manu Exp $
 
-SHA1 (glusterfs-3.7.1.tar.gz) = 02e99a642e659b9c4232d12bff849d360a89c6fd
-RMD160 (glusterfs-3.7.1.tar.gz) = 0e33e3ac9b3eb110bbe1e3d1b6348103c2bc5704
-Size (glusterfs-3.7.1.tar.gz) = 7191402 bytes
-SHA1 (patch-10963) = ce20da94602b6ad4fcc8d63a3d125d5f72ad78f7
+SHA1 (glusterfs-3.7.2.tar.gz) = e67ef3dba8c841db4d36a102ae08faecb92bf8e9
+RMD160 (glusterfs-3.7.2.tar.gz) = f91df269340494e2e4efd0eff01ad2b551476e2d
+Size (glusterfs-3.7.2.tar.gz) = 7283002 bytes
 SHA1 (patch-xlators_mgmt_glusterd_src_Makefile.in) = 188eab283bd7433c86e7767e594ba8fb97645e23
diff --git a/filesystems/glusterfs/patches/patch-10963 b/filesystems/glusterfs/patches/patch-10963
deleted file mode 100644
index f247de6f511..00000000000
--- a/filesystems/glusterfs/patches/patch-10963
+++ /dev/null
@@ -1,110 +0,0 @@
-$NetBSD: patch-10963,v 1.1 2015/06/02 03:44:16 manu Exp $
-
-From upstream http://review.gluster.org/10963
-
-From 5c359a79bd3c978d0f636082871c289c717d354e Mon Sep 17 00:00:00 2001
-From: Krishnan Parthasarathi <kparthas@redhat.com>
-Date: Tue, 19 May 2015 14:48:01 +0530
-Subject: [PATCH] glusterd: fix repeated connection to nfssvc failed msgs
-
-... and disable reconnect timer on rpc_clnt_disconnect.
-
-Root Cause
-----------
-
-gluster-NFS service wouldn't be started if there are no
-started volumes that have nfs service enabled for them.
-Before this fix we would initiate a connect even when
-the gluster-NFS service wasn't (re)started. Compounding
-that glusterd_conn_disconnect doesn't disable reconnect
-timer. So, it is possible that the reconnect timer was
-in execution when  the timer event was attempted to be
-removed.
-
-Change-Id: Iadcb5cff9eafefa95eaf3a1a9413eeb682d3aaac
-BUG: 1222065
-Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com>
-Reviewed-on: http://review.gluster.org/10830
-Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
-Reviewed-by: Gaurav Kumar Garg <ggarg@redhat.com>
-Reviewed-by: Kaushal M <kaushal@redhat.com>
----
-
-diff --git rpc/rpc-lib/src/rpc-clnt.c rpc/rpc-lib/src/rpc-clnt.c
-index 264a312..db99484 100644
---- rpc/rpc-lib/src/rpc-clnt.c
-+++ rpc/rpc-lib/src/rpc-clnt.c
-@@ -1108,6 +1108,11 @@
- 
-         conn = &rpc->conn;
- 
-+        pthread_mutex_lock (&conn->lock);
-+        {
-+                rpc->disabled = 0;
-+        }
-+        pthread_mutex_unlock (&conn->lock);
-         rpc_clnt_reconnect (conn);
- 
-         return 0;
-@@ -1758,6 +1763,7 @@
- 
-         pthread_mutex_lock (&conn->lock);
-         {
-+                rpc->disabled = 1;
-                 if (conn->timer) {
-                         gf_timer_call_cancel (rpc->ctx, conn->timer);
-                         conn->timer = NULL;
-diff --git xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c
-index da8c909..fca9323 100644
---- xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c
-+++ xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c
-@@ -80,7 +80,6 @@
- int
- glusterd_conn_term (glusterd_conn_t *conn)
- {
--        rpc_clnt_disable (conn->rpc);
-         rpc_clnt_unref (conn->rpc);
-         return 0;
- }
-diff --git a/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c xlators/mgmt/glusterd/src/glusterd-nfs-svc.c
-index 49b1b56..cb08a20 100644
---- xlators/mgmt/glusterd/src/glusterd-nfs-svc.c
-+++ xlators/mgmt/glusterd/src/glusterd-nfs-svc.c
-@@ -164,18 +164,15 @@
- {
-         int                 ret     = -1;
- 
--        if (glusterd_are_all_volumes_stopped ()) {
--                ret = svc->stop (svc, SIGKILL);
-+        ret = svc->stop (svc, SIGKILL);
-+        if (ret)
-+                goto out;
- 
--        } else {
--                ret = glusterd_nfssvc_create_volfile ();
--                if (ret)
--                        goto out;
-+        ret = glusterd_nfssvc_create_volfile ();
-+        if (ret)
-+                goto out;
- 
--                ret = svc->stop (svc, SIGKILL);
--                if (ret)
--                        goto out;
--
-+        if (glusterd_nfssvc_need_start ()) {
-                 ret = svc->start (svc, flags);
-                 if (ret)
-                         goto out;
-@@ -192,10 +189,9 @@
- 
- int
- glusterd_nfssvc_start (glusterd_svc_t *svc, int flags)
- {
--        if (glusterd_nfssvc_need_start ())
--                return glusterd_svc_start (svc, flags, NULL);
-+        return glusterd_svc_start (svc, flags, NULL);
- 
-         return 0;
- }
-