From a4ca48189ffe4f4f50791a837ce7fb411c0647fa Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Tue, 26 Jan 2021 13:31:02 -0800 Subject: [PATCH] Revert "ANDROID: Incremental fs: Initialize mount options correctly" This reverts commit 63ddad8bced0124c06cfab82e97c30ed00bfe0a5. Set incfs back to rvc shipping incfs Bug: 178509184 Test: incfs_test passes Signed-off-by: Paul Lawrence Change-Id: Id80c83386b3fb37f48c625c1cd540b8a08a5c203 --- fs/incfs/vfs.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/fs/incfs/vfs.c b/fs/incfs/vfs.c index 2634cf37ca92..250e8bf4d5dd 100644 --- a/fs/incfs/vfs.c +++ b/fs/incfs/vfs.c @@ -180,13 +180,12 @@ static int parse_options(struct mount_options *opts, char *str) if (opts == NULL) return -EFAULT; - *opts = (struct mount_options) { - .read_timeout_ms = 1000, /* Default: 1s */ - .readahead_pages = 10, - .read_log_pages = 2, - .read_log_wakeup_count = 10, - }; - + opts->read_timeout_ms = 1000; /* Default: 1s */ + opts->readahead_pages = 10; + opts->read_log_pages = 2; + opts->read_log_wakeup_count = 10; + opts->no_backing_file_cache = false; + opts->no_backing_file_readahead = false; if (str == NULL || *str == 0) return 0;