Re: [PATCH 01/34] xfs: move incore structures out of xfs_da_format.h

From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 01/34] xfs: move incore structures out of xfs_da_format.h
Date: Mon, 4 Nov 2019 10:21:27 -0800	[thread overview]
Message-ID: <20191104182127.GB4153244@magnolia> (raw)
In-Reply-To: <20191101220719.29100-2-hch@lst.de>

On Fri, Nov 01, 2019 at 03:06:46PM -0700, Christoph Hellwig wrote:
> Move the abstract in-memory version of various btree block headers
> out of xfs_da_format.h as they aren't on-disk formats.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  fs/xfs/libxfs/xfs_attr_leaf.h | 23 ++++++++++++++
>  fs/xfs/libxfs/xfs_da_btree.h  | 13 ++++++++
>  fs/xfs/libxfs/xfs_da_format.c |  1 +
>  fs/xfs/libxfs/xfs_da_format.h | 57 -----------------------------------
>  fs/xfs/libxfs/xfs_dir2.h      |  2 ++
>  fs/xfs/libxfs/xfs_dir2_priv.h | 20 ++++++++++++
>  6 files changed, 59 insertions(+), 57 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.h b/fs/xfs/libxfs/xfs_attr_leaf.h
> index bb0880057ee3..16208a7743df 100644
> --- a/fs/xfs/libxfs/xfs_attr_leaf.h
> +++ b/fs/xfs/libxfs/xfs_attr_leaf.h
> @@ -16,6 +16,29 @@ struct xfs_da_state_blk;
>  struct xfs_inode;
>  struct xfs_trans;
>  
> +/*
> + * Incore version of the attribute leaf header.
> + */
> +struct xfs_attr3_icleaf_hdr {
> +	uint32_t	forw;
> +	uint32_t	back;
> +	uint16_t	magic;
> +	uint16_t	count;
> +	uint16_t	usedbytes;
> +	/*
> +	 * Firstused is 32-bit here instead of 16-bit like the on-disk variant
> +	 * to support maximum fsb size of 64k without overflow issues throughout
> +	 * the attr code. Instead, the overflow condition is handled on
> +	 * conversion to/from disk.
> +	 */
> +	uint32_t	firstused;
> +	__u8		holes;
> +	struct {
> +		uint16_t	base;
> +		uint16_t	size;
> +	} freemap[XFS_ATTR_LEAF_MAPSIZE];
> +};
> +
>  /*
>   * Used to keep a list of "remote value" extents when unlinking an inode.
>   */
> diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h
> index ae0bbd20d9ca..02f7a21ab3a5 100644
> --- a/fs/xfs/libxfs/xfs_da_btree.h
> +++ b/fs/xfs/libxfs/xfs_da_btree.h
> @@ -124,6 +124,19 @@ typedef struct xfs_da_state {
>  						/* for dirv2 extrablk is data */
>  } xfs_da_state_t;
>  
> +/*
> + * In-core version of the node header to abstract the differences in the v2 and
> + * v3 disk format of the headers. Callers need to convert to/from disk format as
> + * appropriate.
> + */
> +struct xfs_da3_icnode_hdr {
> +	uint32_t		forw;
> +	uint32_t		back;
> +	uint16_t		magic;
> +	uint16_t		count;
> +	uint16_t		level;
> +};
> +
>  /*
>   * Utility macros to aid in logging changed structure fields.
>   */
> diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c
> index b1ae572496b6..31bb250c1899 100644
> --- a/fs/xfs/libxfs/xfs_da_format.c
> +++ b/fs/xfs/libxfs/xfs_da_format.c
> @@ -13,6 +13,7 @@
>  #include "xfs_mount.h"
>  #include "xfs_inode.h"
>  #include "xfs_dir2.h"
> +#include "xfs_dir2_priv.h"
>  
>  /*
>   * Shortform directory ops
> diff --git a/fs/xfs/libxfs/xfs_da_format.h b/fs/xfs/libxfs/xfs_da_format.h
> index ae654e06b2fb..548806060f45 100644
> --- a/fs/xfs/libxfs/xfs_da_format.h
> +++ b/fs/xfs/libxfs/xfs_da_format.h
> @@ -93,19 +93,6 @@ struct xfs_da3_intnode {
>  	struct xfs_da_node_entry __btree[];
>  };
>  
> -/*
> - * In-core version of the node header to abstract the differences in the v2 and
> - * v3 disk format of the headers. Callers need to convert to/from disk format as
> - * appropriate.
> - */
> -struct xfs_da3_icnode_hdr {
> -	uint32_t	forw;
> -	uint32_t	back;
> -	uint16_t	magic;
> -	uint16_t	count;
> -	uint16_t	level;
> -};
> -
>  /*
>   * Directory version 2.
>   *
> @@ -434,14 +421,6 @@ struct xfs_dir3_leaf_hdr {
>  	__be32			pad;		/* 64 bit alignment */
>  };
>  
> -struct xfs_dir3_icleaf_hdr {
> -	uint32_t		forw;
> -	uint32_t		back;
> -	uint16_t		magic;
> -	uint16_t		count;
> -	uint16_t		stale;
> -};
> -
>  /*
>   * Leaf block entry.
>   */
> @@ -520,19 +499,6 @@ struct xfs_dir3_free {
>  
>  #define XFS_DIR3_FREE_CRC_OFF  offsetof(struct xfs_dir3_free, hdr.hdr.crc)
>  
> -/*
> - * In core version of the free block header, abstracted away from on-disk format
> - * differences. Use this in the code, and convert to/from the disk version using
> - * xfs_dir3_free_hdr_from_disk/xfs_dir3_free_hdr_to_disk.
> - */
> -struct xfs_dir3_icfree_hdr {
> -	uint32_t	magic;
> -	uint32_t	firstdb;
> -	uint32_t	nvalid;
> -	uint32_t	nused;
> -
> -};
> -
>  /*
>   * Single block format.
>   *
> @@ -709,29 +675,6 @@ struct xfs_attr3_leafblock {
>  	 */
>  };
>  
> -/*
> - * incore, neutral version of the attribute leaf header
> - */
> -struct xfs_attr3_icleaf_hdr {
> -	uint32_t	forw;
> -	uint32_t	back;
> -	uint16_t	magic;
> -	uint16_t	count;
> -	uint16_t	usedbytes;
> -	/*
> -	 * firstused is 32-bit here instead of 16-bit like the on-disk variant
> -	 * to support maximum fsb size of 64k without overflow issues throughout
> -	 * the attr code. Instead, the overflow condition is handled on
> -	 * conversion to/from disk.
> -	 */
> -	uint32_t	firstused;
> -	__u8		holes;
> -	struct {
> -		uint16_t	base;
> -		uint16_t	size;
> -	} freemap[XFS_ATTR_LEAF_MAPSIZE];
> -};
> -
>  /*
>   * Special value to represent fs block size in the leaf header firstused field.
>   * Only used when block size overflows the 2-bytes available on disk.
> diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
> index f54244779492..e170792c0acc 100644
> --- a/fs/xfs/libxfs/xfs_dir2.h
> +++ b/fs/xfs/libxfs/xfs_dir2.h
> @@ -18,6 +18,8 @@ struct xfs_dir2_sf_entry;
>  struct xfs_dir2_data_hdr;
>  struct xfs_dir2_data_entry;
>  struct xfs_dir2_data_unused;
> +struct xfs_dir3_icfree_hdr;
> +struct xfs_dir3_icleaf_hdr;
>  
>  extern struct xfs_name	xfs_name_dotdot;
>  
> diff --git a/fs/xfs/libxfs/xfs_dir2_priv.h b/fs/xfs/libxfs/xfs_dir2_priv.h
> index 59f9fb2241a5..973b1527b7ba 100644
> --- a/fs/xfs/libxfs/xfs_dir2_priv.h
> +++ b/fs/xfs/libxfs/xfs_dir2_priv.h
> @@ -8,6 +8,26 @@
>  
>  struct dir_context;
>  
> +/*
> + * In-core version of the leaf and free block headers to abstract the
> + * differences in the v2 and v3 disk format of the headers.
> + */
> +struct xfs_dir3_icleaf_hdr {
> +	uint32_t		forw;
> +	uint32_t		back;
> +	uint16_t		magic;
> +	uint16_t		count;
> +	uint16_t		stale;
> +};
> +
> +struct xfs_dir3_icfree_hdr {
> +	uint32_t		magic;
> +	uint32_t		firstdb;
> +	uint32_t		nvalid;
> +	uint32_t		nused;
> +
> +};
> +
>  /* xfs_dir2.c */
>  extern int xfs_dir2_grow_inode(struct xfs_da_args *args, int space,
>  				xfs_dir2_db_t *dbp);
> -- 
> 2.20.1
> 