Attachment 15059 Details for Bug 13858 – cherry-pick for 4.9.next and 4.10.next

[patch] cherry-pick for 4.9.next and 4.10.next

0001-vfs_snapper-drop-unneeded-fstat-handler.patch (text/plain), 1.88 KB, created by David Disseldorp on 2019-04-14 20:57:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Disseldorp

Created: 2019-04-14 20:57:42 UTC

Size: 1.88 KB

patch

obsolete

>From b7ee53c5881e29b2a2a11bd8a03a52471f8eaa15 Mon Sep 17 00:00:00 2001
>From: David Disseldorp <ddiss@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@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Wed Mar 27 18:21:38 UTC 2019 on sn-devel-144
>
>(cherry picked from commit c68d9c9ef367c1e85619ac2d027a0a425164ca8a)
>---
> 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 443a940b17a..aa262f1d149 100644
>--- a/source3/modules/vfs_snapper.c
>+++ b/source3/modules/vfs_snapper.c
>@@ -2164,24 +2164,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)
>@@ -3110,7 +3092,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
>

Flags:

jra: review+

Actions: View

Attachments on bug 13858: 15059