From: James Peach <jpeach@samba.org>
Date: Thu, 19 Jul 2007 04:37:38 +0000 (+0000)
Subject: r23962: Linux oplock support is conditional on HAVE_KERNEL_OPLOCKS_LINUX,
X-Git-Tag: samba-4.0.0alpha6~801^2~5303
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33d54d1642006f7a2c1dd39effbb0f0fd80942db;p=thirdparty%2Fsamba.git

r23962: Linux oplock support is conditional on HAVE_KERNEL_OPLOCKS_LINUX,
not plain old LINUX.
(This used to be commit 234cb7c893172edeb6802ac02304a041b33ee939)
---

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 08dd61609cd..6d14e475f1c 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -826,10 +826,11 @@ static int vfswrap_linux_setlease(vfs_handle_struct *handle, files_struct *fsp,
 
 	START_PROFILE(syscall_linux_setlease);
 
-#ifdef LINUX
+#ifdef HAVE_KERNEL_OPLOCKS_LINUX
 	/* first set the signal handler */
-	if(linux_set_lease_sighandler(fd) == -1)
+	if(linux_set_lease_sighandler(fd) == -1) {
 		return -1;
+	}
 
 	result = linux_setlease(fd, leasetype);
 #else