Re: [PATCH 5/6] always use struct xfs_btree_block instead of short / longform structures

[Dave Chinner <david@fromorbit.com>]

On Mon, Sep 15, 2008 at 02:46:57AM +0200, Christoph Hellwig wrote:
> Always use the generic xfs_btree_block type instead of the short / long
> structures.  Add XFS_BTREE_SBLOCK_LEN / XFS_BTREE_LBLOCK_LEN defines for
> the length of a short / long form block.  The rationale for this is that
> we will grow more btree block header variants to support CRCs and other
> RAS information, and always accessing them through the same datatype
> with unions for the short / long form pointers makes implementing this
> much easier.
.......
> @@ -382,16 +382,16 @@ xfs_alloc_fixup_trees(
>  	}
>  #ifdef DEBUG
>  	{
> -		xfs_alloc_block_t	*bnoblock;
> -		xfs_alloc_block_t	*cntblock;
> +		struct xfs_btree_block		*bnoblock;
> +		struct xfs_btree_block		*cntblock;

Only need one tab there?

> +
> +		if (bno_cur->bc_nlevels == 1 && cnt_cur->bc_nlevels == 1) {
> +			bnoblock = XFS_BUF_TO_BLOCK(bno_cur->bc_bufs[0]);
> +			cntblock = XFS_BUF_TO_BLOCK(cnt_cur->bc_bufs[0]);
>  
> -		if (bno_cur->bc_nlevels == 1 &&
> -		    cnt_cur->bc_nlevels == 1) {
> -			bnoblock = XFS_BUF_TO_ALLOC_BLOCK(bno_cur->bc_bufs[0]);
> -			cntblock = XFS_BUF_TO_ALLOC_BLOCK(cnt_cur->bc_bufs[0]);
>  			XFS_WANT_CORRUPTED_RETURN(
> -				be16_to_cpu(bnoblock->bb_numrecs) ==
> -				be16_to_cpu(cntblock->bb_numrecs));
> +				bnoblock->bb_numrecs ==
> +				cntblock->bb_numrecs);

The comparison could probably be made one line....

> @@ -77,24 +72,32 @@ typedef	struct xfs_btree_sblock xfs_allo
>  #define	XFS_CNT_BLOCK(mp)	((xfs_agblock_t)(XFS_BNO_BLOCK(mp) + 1))
>  
>  /*
> + * Btree block header size depends on a superblock flag.
> + *
> + * (not quite yet, but soon)
> + */
> +#define XFS_ALLOC_BLOCK_LEN(mp)	XFS_BTREE_SBLOCK_LEN
> +
> +/*
>   * Record, key, and pointer address macros for btree blocks.
> + * (note that some of these may appear unused, but they are used in userspace)

Shouldn't that comment go in one of the previous patches?
(and others)

Otherwise looks ok....

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com