From d3713d45b76c401c5865a1a0be4ed9fb63b24246 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 9 Jul 2020 18:16:15 -0700 Subject: [PATCH] ANDROID: f2fs: add back compress inode check f2fs_force_buffered_io() originally had two checks of f2fs_compressed_file(), when only one was needed. The one via f2fs_post_read_required() got removed by ANDROID commit 8f48f6657df7 ("ANDROID: ext4, f2fs: enable direct I/O with inline encryption"). Then more recently, the second was removed by upstream commit 69ff0dd3e942 ("f2fs: remove redundant compress inode check"), but this wasn't fixed up during the merge resolution. This incorrectly left no checks remaining, so add one back. Reported at https://lkml.kernel.org/r/560266ca-0164-c02e-18ea-55564683d13e@huawei.com Fixes: a176f88e45ff ("Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.19.y' into android-4.19-stable") Change-Id: I3f6afdd221b6e44f1caa5a92d3c751a573e284df Signed-off-by: Eric Biggers --- fs/f2fs/f2fs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 8b6526e56a09..7dda6a5c51a9 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4091,6 +4091,8 @@ static inline bool f2fs_force_buffered_io(struct inode *inode, return true; if (fsverity_active(inode)) return true; + if (f2fs_compressed_file(inode)) + return true; if (f2fs_is_multi_device(sbi)) return true; /*