Re: [PATCH 3/7] xfs: pass a xfs_efi_log_item to xfs_efi_item_sizeof

["Darrick J. Wong" <djwong@kernel.org>]

On Mon, Apr 19, 2021 at 10:28:00AM +0200, Christoph Hellwig wrote:
> xfs_efi_log_item only looks at the embedded xfs_efi_log_item structure,
> so pass that directly and rename the function to xfs_efi_log_item_sizeof.
> This allows using the helper in xlog_recover_efi_commit_pass2 as well.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  fs/xfs/xfs_extfree_item.c | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
> index ed8d0790908ea7..7ae570d1944590 100644
> --- a/fs/xfs/xfs_extfree_item.c
> +++ b/fs/xfs/xfs_extfree_item.c
> @@ -70,11 +70,11 @@ xfs_efi_release(
>   * structure.
>   */
>  static inline int
> -xfs_efi_item_sizeof(
> -	struct xfs_efi_log_item *efip)
> +xfs_efi_log_item_sizeof(

Shouldn't this be named xfs_efi_log_format_sizeof to correspond to the
name of the structure?  Two patches from now you (re)introduce
xfs_efi_item_sizeof that returns the size of a struct xfs_efi_log_item,
which is confusing.

--D


> +	struct xfs_efi_log_format *elf)
>  {
> -	return sizeof(struct xfs_efi_log_format) +
> -	       (efip->efi_format.efi_nextents - 1) * sizeof(struct xfs_extent);
> +	return sizeof(*elf) +
> +	       (elf->efi_nextents - 1) * sizeof(struct xfs_extent);
>  }
>  
>  STATIC void
> @@ -84,7 +84,7 @@ xfs_efi_item_size(
>  	int			*nbytes)
>  {
>  	*nvecs += 1;
> -	*nbytes += xfs_efi_item_sizeof(EFI_ITEM(lip));
> +	*nbytes += xfs_efi_log_item_sizeof(&EFI_ITEM(lip)->efi_format);
>  }
>  
>  /*
> @@ -110,7 +110,7 @@ xfs_efi_item_format(
>  
>  	xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_EFI_FORMAT,
>  			&efip->efi_format,
> -			xfs_efi_item_sizeof(efip));
> +			xfs_efi_log_item_sizeof(&efip->efi_format));
>  }
>  
>  
> @@ -684,8 +684,7 @@ xlog_recover_efi_commit_pass2(
>  
>  	efip = xfs_efi_init(mp, src->efi_nextents);
>  
> -	if (buf->i_len != sizeof(*src) +
> -	    (src->efi_nextents - 1) * sizeof(struct xfs_extent)) {
> +	if (buf->i_len != xfs_efi_log_item_sizeof(src)) {
>  		error = xfs_efi_copy_format_32(&efip->efi_format, buf);
>  		if (error)
>  			goto out_free_efi;
> -- 
> 2.30.1
>