tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fuse: disable the combination of passthrough and writeback cache"

Browse Source 
This reverts commit 3ab394b363.

Bug: 369413666
Test: atest android.scopedstorage.cts.general.ScopedStorageDeviceTest
Change-Id: Icb0bf41d8e64898f026334ae89246e59f9cd9067
Signed-off-by: Daniel Rosenberg <drosen@google.com>
This commit is contained in:
Daniel Rosenberg
2024-09-18 17:43:55 -07:00
parent 65687870ee
commit d30885a29d
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/fuse/inode.c
+1 -6
View File
@@ -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 * on a stacked fs (e.g. overlayfs) themselves and with
* max_stack_depth == 1, FUSE fs can be stacked as the * max_stack_depth == 1, FUSE fs can be stacked as the
* underlying fs of a stacked fs (e.g. overlayfs). * 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) && if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH) &&
(flags & FUSE_PASSTHROUGH) && (flags & FUSE_PASSTHROUGH) &&
arg->max_stack_depth > 0 && arg->max_stack_depth > 0 &&
arg->max_stack_depth <= FILESYSTEM_MAX_STACK_DEPTH && arg->max_stack_depth <= FILESYSTEM_MAX_STACK_DEPTH) {
!(flags & FUSE_WRITEBACK_CACHE)) {
fc->passthrough = 1; fc->passthrough = 1;
fc->max_stack_depth = arg->max_stack_depth; fc->max_stack_depth = arg->max_stack_depth;
fm->sb->s_stack_depth = arg->max_stack_depth; fm->sb->s_stack_depth = arg->max_stack_depth;