From f5aa90efe86474e7ccb4155fae36eb0ee83207f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Mon, 4 Sep 2023 13:59:12 +0100 Subject: [PATCH] FROMLIST: Revert "fuse: Apply flags2 only when userspace set the FUSE_INIT_EXT" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Bernd Schubert Cc: Miklos Szeredi Cc: Signed-off-by: André Draszik Test: TH Bug: 298946207 Link: https://lore.kernel.org/all/20230904133321.104584-1-git@andred.net/ Change-Id: I853761625a57d3259252d5eb695828b35ed40b4d Signed-off-by: André Draszik Signed-off-by: Greg Kroah-Hartman --- 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 34a0535f2e95..697e7b5b8319 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1303,10 +1303,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)