[PATCH] bump vfs interface version

Ira Cooper ira at samba.org
Wed Feb 18 06:48:42 MST 2015


If we can ship this in 4.2... I'd like to.

-Ira

On Wed, Feb 18, 2015 at 12:52:59PM +0100, David Disseldorp wrote:
> On Mon, 16 Feb 2015 17:35:49 -0800, Jeremy Allison wrote:
> 
> > *Really* nice cleanup - pushed. Thanks !
> 
> Thanks for the review Jeremy!
> 
> > Only one thing, if we ship 4.2.0 as VFS version 32,
> > we'll need to update this in master to 33 ensure the
> > version containing this change isn't confused with
> > the 4.2.0 VFS version.
> > 
> > If you're not planning to get this into 4.2.x, then
> > I'd add my 'Reviewed-by' to a patch that updates the
> > version to 33 for this change.
> 
> Please see attached.
> In future we should probably consider tracking VFS version number
> changes purely in git - the source3/include/vfs.h changelog is a bit
> redundant IMO.
> 
> Cheers, David

> From 04c60fba8245340e7dd1e70996279fcb33b05b77 Mon Sep 17 00:00:00 2001
> From: David Disseldorp <ddiss at samba.org>
> Date: Wed, 18 Feb 2015 12:01:14 +0100
> Subject: [PATCH] s3/vfs: bump interface version number to 33
> 
> The SMB_VFS_DISK_FREE() small_query parameter removal cleanup will not
> be merged for Samba 4.2, so the master SMB_VFS_INTERFACE_VERSION number
> should be bumped above what's currently present in the 4.2 branch.
> 
> Signed-off-by: David Disseldorp <ddiss at samba.org>
> ---
>  source3/include/vfs.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/source3/include/vfs.h b/source3/include/vfs.h
> index 3444f62..13143c2 100644
> --- a/source3/include/vfs.h
> +++ b/source3/include/vfs.h
> @@ -162,8 +162,9 @@
>  /* Version 32 - Add SMB_VFS_READDIR_ATTR() */
>  /* Version 32 - Add in and out create context blobs to create_file */
>  /* Version 32 - Remove unnecessary SMB_VFS_DISK_FREE() small_query parameter */
> +/* Bump to version 33 - Samba 4.3 will ship with that. */
>  
> -#define SMB_VFS_INTERFACE_VERSION 32
> +#define SMB_VFS_INTERFACE_VERSION 33
>  
>  /*
>      All intercepted VFS operations must be declared as static functions inside module source
> -- 
> 2.1.4
> 



More information about the samba-technical mailing list