From: Eric Biggers <ebiggers@kernel.org>
To: linux-fscrypt@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-btrfs@vger.kernel.org
Subject: [PATCH 3/6] ext4: simplify ext4_readpage_limit()
Date: Fri, 28 Oct 2022 15:45:36 -0700 [thread overview]
Message-ID: <20221028224539.171818-4-ebiggers@kernel.org> (raw)
In-Reply-To: <20221028224539.171818-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
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>
---
fs/ext4/readpage.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c
index e604ea4e102b7..babaa7160c556 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);
--
2.38.0
next prev parent reply other threads:[~2022-10-28 22:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-28 22:45 [PATCH 0/6] fsverity: support for non-4K pages Eric Biggers
2022-10-28 22:45 ` [PATCH 1/6] fsverity: support verification with tree block size < PAGE_SIZE Eric Biggers
2022-10-28 22:45 ` [PATCH 2/6] fsverity: support enabling " Eric Biggers
2022-10-28 22:45 ` Eric Biggers [this message]
2022-10-28 22:45 ` [PATCH 4/6] f2fs: simplify f2fs_readpage_limit() Eric Biggers
2022-10-28 22:45 ` [PATCH 5/6] fs/buffer.c: support fsverity in block_read_full_folio() Eric Biggers
2022-10-28 22:45 ` [PATCH 6/6] ext4: allow verity with fs block size < PAGE_SIZE Eric Biggers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221028224539.171818-4-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).