summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-07-19 04:37:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:28:49 -0500
commit33d54d1642006f7a2c1dd39effbb0f0fd80942db (patch)
tree931139ecbe82f14224ffe923132d07c90a557b6b /source3
parentb8a4863ca4ac3e127ec681b8da462a8020a87395 (diff)
downloadsamba-33d54d1642006f7a2c1dd39effbb0f0fd80942db.tar.gz
samba-33d54d1642006f7a2c1dd39effbb0f0fd80942db.tar.bz2
samba-33d54d1642006f7a2c1dd39effbb0f0fd80942db.zip
r23962: Linux oplock support is conditional on HAVE_KERNEL_OPLOCKS_LINUX,
not plain old LINUX. (This used to be commit 234cb7c893172edeb6802ac02304a041b33ee939)
Diffstat (limited to 'source3')
-rw-r--r--source3/modules/vfs_default.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 08dd61609c..6d14e475f1 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