From d30885a29d6526b6f138843023920289f6480373 Mon Sep 17 00:00:00 2001 From: Daniel Rosenberg Date: Wed, 18 Sep 2024 17:43:55 -0700 Subject: [PATCH] Revert "fuse: disable the combination of passthrough and writeback cache" This reverts commit 3ab394b363c5fd14b231e335fb6746ddfb93aaaa. Bug: 369413666 Test: atest android.scopedstorage.cts.general.ScopedStorageDeviceTest Change-Id: Icb0bf41d8e64898f026334ae89246e59f9cd9067 Signed-off-by: Daniel Rosenberg --- fs/fuse/inode.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index fd3321e29a3e..e96ae686e059 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1332,16 +1332,11 @@ static void process_init_reply(struct fuse_mount *fm, struct fuse_args *args, * on a stacked fs (e.g. overlayfs) themselves and with * max_stack_depth == 1, FUSE fs can be stacked as the * underlying fs of a stacked fs (e.g. overlayfs). - * - * Also don't allow the combination of FUSE_PASSTHROUGH - * and FUSE_WRITEBACK_CACHE, current design doesn't handle - * them together. */ if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH) && (flags & FUSE_PASSTHROUGH) && arg->max_stack_depth > 0 && - arg->max_stack_depth <= FILESYSTEM_MAX_STACK_DEPTH && - !(flags & FUSE_WRITEBACK_CACHE)) { + arg->max_stack_depth <= FILESYSTEM_MAX_STACK_DEPTH) { fc->passthrough = 1; fc->max_stack_depth = arg->max_stack_depth; fm->sb->s_stack_depth = arg->max_stack_depth;