diff options
| author | Eric Biggers <ebiggers@google.com> | 2022-12-23 12:36:35 -0800 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2023-01-09 19:06:08 -0800 |
| commit | 5e122148a3d573a66f47f826168a3c23a321ac9d (patch) | |
| tree | 624fab037c55ed9ca182e0e468ddc9dc52838d76 /fs | |
| parent | 56124d6c87fd749477425110d2564166621a89c4 (diff) | |
| download | linux-5e122148a3d573a66f47f826168a3c23a321ac9d.tar.gz | |
ext4: simplify ext4_readpage_limit()
Now that the implementation of FS_IOC_ENABLE_VERITY has changed to not
involve reading back Merkle tree blocks that were previously written,
there is no need for ext4_readpage_limit() to allow for this case.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Tested-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
Link: https://lore.kernel.org/r/20221223203638.41293-9-ebiggers@kernel.org
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/readpage.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c index d5266932ce6cd6..c61dc8a7c01479 100644 --- a/fs/ext4/readpage.c +++ b/fs/ext4/readpage.c @@ -211,8 +211,7 @@ static void ext4_set_bio_post_read_ctx(struct bio *bio, static inline loff_t ext4_readpage_limit(struct inode *inode) { - if (IS_ENABLED(CONFIG_FS_VERITY) && - (IS_VERITY(inode) || ext4_verity_in_progress(inode))) + if (IS_ENABLED(CONFIG_FS_VERITY) && IS_VERITY(inode)) return inode->i_sb->s_maxbytes; return i_size_read(inode); |