Eric Biggers 46f875355d 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 4f27c8b90bd2
("ANDROID: ext4, f2fs: enable direct I/O with inline encryption").  Then
more recently, the second was removed by upstream commit 73bfe5dfd09d
("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: db50a8301ece ("Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.14.y' into android-4.14-stable")
Change-Id: I3f6afdd221b6e44f1caa5a92d3c751a573e284df
Signed-off-by: Eric Biggers <ebiggers@google.com>

2020-07-10 14:08:39 -07:00

..

acl.c

f2fs: Replace spaces with tab

2019-05-08 21:36:51 -07:00

acl.h

f2fs: Use the correct style for SPDX License Identifier

2020-05-18 13:23:32 -07:00

checkpoint.c

f2fs: don't return vmalloc() memory from f2fs_kmalloc()

2020-06-08 20:41:27 -07:00

compress.c

Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.14.y' into android-4.14-stable

2020-06-15 13:25:41 -07:00

data.c

FROMLIST: f2fs: fix use-after-free when accessing bio->bi_crypt_context

2020-06-22 19:32:27 +00:00

debug.c

f2fs: show mounted time

2020-04-06 13:05:26 -07:00

dir.c

f2fs: avoid utf8_strncasecmp() with unstable name

2020-06-08 20:41:28 -07:00

extent_cache.c

f2fs: introduce f2fs_<level> macros to wrap f2fs_printk()

2019-07-12 15:31:46 -07:00

f2fs.h

ANDROID: f2fs: add back compress inode check

2020-07-10 14:08:39 -07:00

file.c

Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.14.y' into android-4.14-stable

2020-06-15 13:25:41 -07:00

gc.c

f2fs: add compressed/gc data read IO stat

2020-05-18 23:43:58 -07:00

gc.h

f2fs: Use the correct style for SPDX License Identifier

2020-05-18 13:23:32 -07:00

hash.c

Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.14.y' into android-4.14-stable

2020-05-27 13:43:59 -07:00

inline.c

Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.14.y' into android-4.14-stable

2020-05-27 13:43:59 -07:00

inode.c

f2fs: fix potential .flags overflow on 32bit architecture

2020-04-06 13:05:31 -07:00

Kconfig

f2fs: compress: support zstd compress algorithm

2020-04-06 13:05:33 -07:00

Makefile

f2fs: support data compression

2020-01-28 10:37:32 -08:00

namei.c

Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.14.y' into android-4.14-stable

2020-06-15 13:25:41 -07:00

node.c

f2fs: don't return vmalloc() memory from f2fs_kmalloc()

2020-06-08 20:41:27 -07:00

node.h

f2fs: shrink spinlock coverage

2020-05-18 23:43:53 -07:00

recovery.c

Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.14.y' into android-4.14-stable

2020-05-27 13:43:59 -07:00

segment.c

f2fs: fix wrong discard space

2020-05-30 08:49:08 -07:00

segment.h

f2fs: Use the correct style for SPDX License Identifier

2020-05-18 13:23:32 -07:00

shrinker.c

f2fs: fix inconsistent comments

2020-04-06 13:05:25 -07:00

super.c

Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.14.y' into android-4.14-stable

2020-06-22 09:43:05 -07:00

sysfs.c

Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.14.y' into android-4.14-stable

2020-06-22 09:43:05 -07:00

trace.c

f2fs: do not use mutex lock in atomic context

2019-04-05 22:31:27 +02:00

trace.h

f2fs: Use the correct style for SPDX License Identifier

2020-05-18 13:23:32 -07:00

verity.c

fs-verity: implement readahead of Merkle tree pages

2020-02-13 15:17:46 -08:00

xattr.c

f2fs: use kmem_cache pool during inline xattr lookups

2020-04-06 13:05:29 -07:00

xattr.h

f2fs: code cleanup by removing ifdef macro surrounding

2020-05-30 08:49:03 -07:00