svn commit: samba r23962 - in branches/SAMBA_3_2/source/modules: .

jpeach at samba.org jpeach at samba.org
Thu Jul 19 04:37:39 GMT 2007


Author: jpeach
Date: 2007-07-19 04:37:38 +0000 (Thu, 19 Jul 2007)
New Revision: 23962

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23962

Log:
Linux oplock support is conditional on HAVE_KERNEL_OPLOCKS_LINUX,
not plain old LINUX.

Modified:
   branches/SAMBA_3_2/source/modules/vfs_default.c


Changeset:
Modified: branches/SAMBA_3_2/source/modules/vfs_default.c
===================================================================
--- branches/SAMBA_3_2/source/modules/vfs_default.c	2007-07-19 04:00:32 UTC (rev 23961)
+++ branches/SAMBA_3_2/source/modules/vfs_default.c	2007-07-19 04:37:38 UTC (rev 23962)
@@ -826,10 +826,11 @@
 
 	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



More information about the samba-cvs mailing list