public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Revert "fuse: Apply flags2 only when userspace set the FUSE_INIT_EXT"
@ 2023-09-04 12:59 André Draszik
  2023-09-04 14:53 ` Greg KH
  0 siblings, 1 reply; 3+ messages in thread
From: André Draszik @ 2023-09-04 12:59 UTC (permalink / raw)
  To: linux-kernel; +Cc: André Draszik, stable

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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-09-04 14:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20230904125747.102023-1-git@andred.net>
2023-09-04 12:57 ` [PATCH] Revert "fuse: Apply flags2 only when userspace set the FUSE_INIT_EXT" André Draszik
2023-09-04 12:59 André Draszik
2023-09-04 14:53 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox