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

diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c
index d5266932ce6cd65336795708ff1ebd19ea214735..c61dc8a7c01479e4fc79efbb64be3cd1ebdb8d11 100644 (file)
--- 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);