Re: [PATCH 02/16] btrfs: factor out a btrfs_verify_page helper

[Anand Jain <anand.jain@oracle.com>]

On 23/05/2023 16:13, Christoph Hellwig wrote:
> Split all the conditionals for the fsverity calls in end_page_read into
> a btrfs_verify_page helper to keep the code readable and make additional
> refacoring easier.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>   fs/btrfs/extent_io.c | 15 ++++++++++-----
>   1 file changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index c1b0ca94be34e1..fc48888742debd 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -481,6 +481,15 @@ void extent_clear_unlock_delalloc(struct btrfs_inode *inode, u64 start, u64 end,
>   			       start, end, page_ops, NULL);
>   }
>   
> +static int btrfs_verify_page(struct page *page, u64 start)

  Did you consider making it an inline function?

Thanks, Anand

> +{
> +	if (!fsverity_active(page->mapping->host) ||
> +	    PageError(page) || PageUptodate(page) ||
> +	    start >= i_size_read(page->mapping->host))
> +		return true;
> +	return fsverity_verify_page(page);
> +}
> +
>   static void end_page_read(struct page *page, bool uptodate, u64 start, u32 len)
>   {
>   	struct btrfs_fs_info *fs_info = btrfs_sb(page->mapping->host->i_sb);
> @@ -489,11 +498,7 @@ static void end_page_read(struct page *page, bool uptodate, u64 start, u32 len)
>   	       start + len <= page_offset(page) + PAGE_SIZE);
>   
>   	if (uptodate) {
> -		if (fsverity_active(page->mapping->host) &&
> -		    !PageError(page) &&
> -		    !PageUptodate(page) &&
> -		    start < i_size_read(page->mapping->host) &&
> -		    !fsverity_verify_page(page)) {
> +		if (!btrfs_verify_page(page, start)) {
>   			btrfs_page_set_error(fs_info, page, start, len);
>   		} else {
>   			btrfs_page_set_uptodate(fs_info, page, start, len);