Re: [PATCH 02/15] use the same btree_cur union member for alloc and inobt trees

[Timothy Shimmin <tes@sgi.com>]

Hi there,

This was fine but just one thing which looked odd:

Christoph Hellwig wrote:
>  
> Index: linux-2.6-xfs/fs/xfs/xfs_btree.c
> ===================================================================
> --- linux-2.6-xfs.orig/fs/xfs/xfs_btree.c	2008-07-16 03:24:18.000000000 +0200
> +++ linux-2.6-xfs/fs/xfs/xfs_btree.c	2008-07-16 03:24:19.000000000 +0200
> @@ -570,6 +570,13 @@ xfs_btree_init_cursor(
>  		cur->bc_private.a.agbp = agbp;
>  		cur->bc_private.a.agno = agno;
>  		break;
> +	case XFS_BTNUM_INO:
> +		/*
> +		 * Inode allocation btree fields.
> +		 */
> +		cur->bc_private.a.agbp = agbp;
> +		cur->bc_private.a.agno = agno;
> +		break;
>  	case XFS_BTNUM_BMAP:
>  		/*
>  		 * Bmap btree fields.
> @@ -582,13 +589,6 @@ xfs_btree_init_cursor(
>  		cur->bc_private.b.flags = 0;
>  		cur->bc_private.b.whichfork = whichfork;
>  		break;
> -	case XFS_BTNUM_INO:
> -		/*
> -		 * Inode allocation btree fields.
> -		 */
> -		cur->bc_private.i.agbp = agbp;
> -		cur->bc_private.i.agno = agno;
> -		break;
>  	default:

Could probably just add XFS_BNUM_INO to the case below
(and modify the comment):
> 	case XFS_BTNUM_BNO:
> 	case XFS_BTNUM_CNT:
> 		/*
> 		 * Allocation btree fields.
> 		 */
> 		cur->bc_private.a.agbp = agbp;
> 		cur->bc_private.a.agno = agno;
> 		break;

--Tim