Author: jmcd Date: 2006-11-10 15:43:29 +0000 (Fri, 10 Nov 2006) New Revision: 19655
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19655 Log: 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. Modified: branches/SAMBA_3_0/source/include/vfs.h branches/SAMBA_3_0_24/source/include/vfs.h Changeset: Modified: branches/SAMBA_3_0/source/include/vfs.h =================================================================== --- branches/SAMBA_3_0/source/include/vfs.h 2006-11-10 15:40:48 UTC (rev 19654) +++ branches/SAMBA_3_0/source/include/vfs.h 2006-11-10 15:43:29 UTC (rev 19655) @@ -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 */ Modified: branches/SAMBA_3_0_24/source/include/vfs.h =================================================================== --- branches/SAMBA_3_0_24/source/include/vfs.h 2006-11-10 15:40:48 UTC (rev 19654) +++ branches/SAMBA_3_0_24/source/include/vfs.h 2006-11-10 15:43:29 UTC (rev 19655) @@ -62,7 +62,8 @@ /* Changed to version 14 as we had to change DIR to SMB_STRUCT_DIR. JRA */ /* Changed to version 15 as we added the statvfs call. JRA */ /* Changed to version 16 as we added the getlock call. JRA */ -#define SMB_VFS_INTERFACE_VERSION 16 +/* Changed to version 17 to add kernel_flock call. Note in 3.0 dev branch it's different - jmcd */ +#define SMB_VFS_INTERFACE_VERSION 17 /* to bug old modules which are trying to compile with the old functions */