Attachment 16803 Details for Bug 14790 – git-am fix for 4.15.next, 4.14.next.

[patch] git-am fix for 4.15.next, 4.14.next.

0001-vfs_btrfs-fix-btrfs_fget_compression.patch (text/plain), 1.47 KB, created by Jeremy Allison on 2021-09-10 18:47:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2021-09-10 18:47:42 UTC

Size: 1.47 KB

patch

obsolete

>From 0ee6443f82e96ba90da273b79c006f424011a5f5 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Mon, 9 Aug 2021 19:30:21 +0200
>Subject: [PATCH] vfs_btrfs: fix btrfs_fget_compression()
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14790
>RB: vfs_btrfs compression support broken
>
>Reported-by: noel.kuntze@thermi.consulting
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>---
> source3/modules/vfs_btrfs.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/source3/modules/vfs_btrfs.c b/source3/modules/vfs_btrfs.c
>index 789bc6d6e8a..a31b232af4d 100644
>--- a/source3/modules/vfs_btrfs.c
>+++ b/source3/modules/vfs_btrfs.c
>@@ -460,11 +460,12 @@ static NTSTATUS btrfs_fget_compression(struct vfs_handle_struct *handle,
> 	const char *p = NULL;
> 	int ret;
> 	long flags = 0;
>+	int fsp_fd = fsp_get_pathref_fd(fsp);
> 	int fd = -1;
> 	NTSTATUS status;
> 
> 	if (!fsp->fsp_flags.is_pathref) {
>-		ret = ioctl(fd, FS_IOC_GETFLAGS, &flags);
>+		ret = ioctl(fsp_fd, FS_IOC_GETFLAGS, &flags);
> 		if (ret < 0) {
> 			DBG_WARNING("FS_IOC_GETFLAGS failed: %s, fd %lld\n",
> 				    strerror(errno), (long long)fd);
>@@ -482,9 +483,7 @@ static NTSTATUS btrfs_fget_compression(struct vfs_handle_struct *handle,
> 		return NT_STATUS_NOT_IMPLEMENTED;
> 	}
> 
>-	fd = fsp_get_pathref_fd(fsp);
>-
>-	p = sys_proc_fd_path(fd, buf, sizeof(buf));
>+	p = sys_proc_fd_path(fsp_fd, buf, sizeof(buf));
> 	if (p == NULL) {
> 		return NT_STATUS_NO_MEMORY;
> 	}
>-- 
>2.30.2
>

Flags:

slow: review+

Actions: View

Attachments on bug 14790: 16722 | 16723 | 16725 | 16803