Commit 8b7d3fe9 authored by Eric Biggers's avatar Eric Biggers
Browse files

fs/buffer.c: use b_folio for fsverity work

Use b_folio now that it exists.  This removes an unnecessary call to
compound_head().  No actual change in behavior.

Link: https://lore.kernel.org/r/20230224232530.98440-1-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 197b6b60
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -308,20 +308,19 @@ static void verify_bh(struct work_struct *work)
	struct buffer_head *bh = ctx->bh;
	bool valid;

	valid = fsverity_verify_blocks(page_folio(bh->b_page), bh->b_size,
				       bh_offset(bh));
	valid = fsverity_verify_blocks(bh->b_folio, bh->b_size, bh_offset(bh));
	end_buffer_async_read(bh, valid);
	kfree(ctx);
}

static bool need_fsverity(struct buffer_head *bh)
{
	struct page *page = bh->b_page;
	struct inode *inode = page->mapping->host;
	struct folio *folio = bh->b_folio;
	struct inode *inode = folio->mapping->host;

	return fsverity_active(inode) &&
		/* needed by ext4 */
		page->index < DIV_ROUND_UP(inode->i_size, PAGE_SIZE);
		folio->index < DIV_ROUND_UP(inode->i_size, PAGE_SIZE);
}

static void decrypt_bh(struct work_struct *work)