summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2006-11-10 15:43:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:15:44 -0500
commit3e8809cb4c92d326acf07b73fc9140cb2effceaa (patch)
tree4bf00e21094a3732293ed4d9dd273906efe67df3
parentc9567f2f221cd19f455cff207feec9efe2171632 (diff)
downloadsamba-3e8809cb4c92d326acf07b73fc9140cb2effceaa.tar.gz
samba-3e8809cb4c92d326acf07b73fc9140cb2effceaa.tar.bz2
samba-3e8809cb4c92d326acf07b73fc9140cb2effceaa.zip
r19655: Jeremy, please review:
I updated the vfs version in 3.0.24 from 16 to 17, beacuse 16 was the latest released code, but on SAMBA_3_0, I reverted my earlier change back from 19 to 18, because we've not had any released code with 18. This is related to the kernel_flock call addition. (This used to be commit fb8e43fb493b486c31fc141b5240a7dd36c9219f)
-rw-r--r--source3/include/vfs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 9a547b9ab0..9a04fcb423 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -63,9 +63,9 @@
/* Changed to version 15 as we added the statvfs call. JRA */
/* Changed to version 16 as we added the getlock call. JRA */
/* Changed to version 17 as we removed redundant connection_struct parameters. --jpeach */
-/* Changed to version 18 to add fsp parameter to the open call -- jpeach */
-/* Changed to version 19 to add kernel_flock call - jmcd */
-#define SMB_VFS_INTERFACE_VERSION 19
+/* Changed to version 18 to add fsp parameter to the open call -- jpeach
+ Also include kernel_flock call - jmcd */
+#define SMB_VFS_INTERFACE_VERSION 18
/* to bug old modules which are trying to compile with the old functions */