linux-ext4 - Re: [PATCH] fs/buffer.c: use b

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <ZAeTXsquewxAOHXI@sol.localdomain>
Date:   Tue, 7 Mar 2023 11:41:18 -0800
From:   Eric Biggers <ebiggers@...nel.org>
To:     fsverity@...ts.linux.dev
Cc:     linux-ext4@...r.kernel.org, Matthew Wilcox <willy@...radead.org>
Subject: Re: [PATCH] fs/buffer.c: use b_folio for fsverity work

On Fri, Feb 24, 2023 at 03:25:30PM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@...gle.com>
> 
> Use b_folio now that it exists.  This removes an unnecessary call to
> compound_head().  No actual change in behavior.
> 
> Signed-off-by: Eric Biggers <ebiggers@...gle.com>
> ---
>  fs/buffer.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/buffer.c b/fs/buffer.c
> index 9e1e2add541e..034bece27163 100644
> --- a/fs/buffer.c
> +++ b/fs/buffer.c
> @@ -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)
> -- 

Applied to https://git.kernel.org/pub/scm/fs/fsverity/linux.git/log/?h=for-next

- Eric