From: Christian Ambach <ambi@samba.org>
Date: Thu, 22 Mar 2012 17:11:47 +0000 (+0100)
Subject: s3:vfs_gpfs: remove fallback to linux_setlease
X-Git-Tag: tdb-1.2.10~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a37ca5210c8591fc12a6560d3c5fc3ccdeceede;p=thirdparty%2Fsamba.git

s3:vfs_gpfs: remove fallback to linux_setlease

if setting the lease in GPFS failed, there is not much sense in trying
to set a lease just locally that would not inform us of openers
on other cluster nodes
---

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 6d66b291870..204017d6fce 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -108,12 +108,6 @@ static int vfs_gpfs_setlease(vfs_handle_struct *handle, files_struct *fsp,
 		ret = set_gpfs_lease(fsp->fh->fd,leasetype);
 	}
 
-	if (ret < 0) {
-		/* This must have come from GPFS not being available */
-		/* or some other error, hence call the default */
-		ret = linux_setlease(fsp->fh->fd, leasetype);
-	}
-
 	END_PROFILE(syscall_linux_setlease);
 
 	return ret;