[PATCH] vfs_snapper: drop unneeded fstat handler

Jeremy Allison jra at samba.org
Wed Mar 27 16:52:18 UTC 2019


On Mon, Mar 25, 2019 at 06:35:24PM +0100, David Disseldorp wrote:
> Feedback appreciated.

LGTM. RB+ and pushed, thanks !

> From d0775f090f26bf131bb0fe120c1f867328852c17 Mon Sep 17 00:00:00 2001
> From: David Disseldorp <ddiss at samba.org>
> Date: Mon, 25 Mar 2019 18:06:15 +0100
> Subject: [PATCH] vfs_snapper: drop unneeded fstat handler
> 
> fstat is handle based, and unlike vfs_shadow_copy2, we don't need to
> make any changes to the returned sbuf, so remove the existing handler
> which does nothing.
> 
> Bug: https://bugzilla.samba.org/show_bug.cgi?id=13858
> 
> Signed-off-by: David Disseldorp <ddiss at samba.org>
> ---
>  source3/modules/vfs_snapper.c | 19 -------------------
>  1 file changed, 19 deletions(-)
> 
> diff --git a/source3/modules/vfs_snapper.c b/source3/modules/vfs_snapper.c
> index 0f52f9e71c5..fac4aa698de 100644
> --- a/source3/modules/vfs_snapper.c
> +++ b/source3/modules/vfs_snapper.c
> @@ -2165,24 +2165,6 @@ static int snapper_gmt_lstat(vfs_handle_struct *handle,
>  	return ret;
>  }
>  
> -static int snapper_gmt_fstat(vfs_handle_struct *handle, files_struct *fsp,
> -			     SMB_STRUCT_STAT *sbuf)
> -{
> -	time_t timestamp;
> -	int ret;
> -
> -	ret = SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf);
> -	if (ret == -1) {
> -		return ret;
> -	}
> -	if (!snapper_gmt_strip_snapshot(talloc_tos(), handle,
> -					fsp->fsp_name->base_name,
> -					&timestamp, NULL)) {
> -		return 0;
> -	}
> -	return 0;
> -}
> -
>  static int snapper_gmt_open(vfs_handle_struct *handle,
>  			    struct smb_filename *smb_fname, files_struct *fsp,
>  			    int flags, mode_t mode)
> @@ -3111,7 +3093,6 @@ static struct vfs_fn_pointers snapper_fns = {
>  	.symlink_fn = snapper_gmt_symlink,
>  	.stat_fn = snapper_gmt_stat,
>  	.lstat_fn = snapper_gmt_lstat,
> -	.fstat_fn = snapper_gmt_fstat,
>  	.open_fn = snapper_gmt_open,
>  	.unlink_fn = snapper_gmt_unlink,
>  	.chmod_fn = snapper_gmt_chmod,
> -- 
> 2.16.4
> 




More information about the samba-technical mailing list