From: Eric Biggers <ebiggers@google.com>
Date: Fri, 23 Dec 2022 20:36:36 +0000 (-0800)
Subject: f2fs: simplify f2fs_readpage_limit()
X-Git-Tag: v6.6.17~5561^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=feb0576a361aacaf12c49e66d32e293a0f3a2e64;p=platform%2Fkernel%2Flinux-rpi.git

f2fs: simplify f2fs_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 f2fs_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-10-ebiggers@kernel.org
---

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 6e43e19..6c403e2 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2053,8 +2053,7 @@ out:
 
 static inline loff_t f2fs_readpage_limit(struct inode *inode)
 {
-	if (IS_ENABLED(CONFIG_FS_VERITY) &&
-	    (IS_VERITY(inode) || f2fs_verity_in_progress(inode)))
+	if (IS_ENABLED(CONFIG_FS_VERITY) && IS_VERITY(inode))
 		return inode->i_sb->s_maxbytes;
 
 	return i_size_read(inode);