[PATCH] Revert "fuse: Apply flags2 only when userspace set the FUSE_INIT_EXT"

André Draszik posted 1 patch 2 years, 5 months ago
There is a newer version of this series
fs/fuse/inode.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
[PATCH] Revert "fuse: Apply flags2 only when userspace set the FUSE_INIT_EXT"
Posted by André Draszik 2 years, 5 months ago
From: André Draszik <andre.draszik@linaro.org>

This reverts commit 3066ff93476c35679cb07a97cce37d9bb07632ff.

This patch breaks all existing userspace by requiring updates as
mentioned in the commit message, which is not allowed.

Revert to restore compatibility with existing userspace
implementations.

Cc: <stable@vger.kernel.org>
Signed-off-by: André Draszik <andre.draszik@linaro.org>
---
 fs/fuse/inode.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 549358ffea8b..0b966b0e0962 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -1132,10 +1132,7 @@ static void process_init_reply(struct fuse_mount *fm, struct fuse_args *args,
 		process_init_limits(fc, arg);
 
 		if (arg->minor >= 6) {
-			u64 flags = arg->flags;
-
-			if (flags & FUSE_INIT_EXT)
-				flags |= (u64) arg->flags2 << 32;
+			u64 flags = arg->flags | (u64) arg->flags2 << 32;
 
 			ra_pages = arg->max_readahead / PAGE_SIZE;
 			if (flags & FUSE_ASYNC_READ)
-- 
2.40.1

Re: [PATCH] Revert "fuse: Apply flags2 only when userspace set the FUSE_INIT_EXT"
Posted by Greg KH 2 years, 5 months ago
On Mon, Sep 04, 2023 at 01:59:12PM +0100, André Draszik wrote:
> From: André Draszik <andre.draszik@linaro.org>
> 
> This reverts commit 3066ff93476c35679cb07a97cce37d9bb07632ff.
> 
> This patch breaks all existing userspace by requiring updates as
> mentioned in the commit message, which is not allowed.
> 
> Revert to restore compatibility with existing userspace
> implementations.
> 
> Cc: <stable@vger.kernel.org>
> Signed-off-by: André Draszik <andre.draszik@linaro.org>
> ---
>  fs/fuse/inode.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)

You forgot to cc: the original author of this change :(

With that, feel free to add:
	Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

thanks,

greg k-h