github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 05:55:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: f2fs: add back compress inode check

Browse Source 
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 141f59b911
("ANDROID: ext4, f2fs: enable direct I/O with inline encryption").  Then
more recently, the second was removed by upstream commit b5f4684b5f
("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: 8912845e4e ("Merge 42612e7763 ("Merge tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline")
Change-Id: I3f6afdd221b6e44f1caa5a92d3c751a573e284df
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers 2020-07-09 18:16:15 -07:00
parent a1fc1fba46
commit f19515bca8
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/f2fs/f2fs.h
View File

@ -4081,6 +4081,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;
/*