[PATCH 05/14] repair: reduce byte swapping in scan_freelist

[Eric Sandeen]

Christoph Hellwig wrote:

> Store the ag number in a local native endian variable to avoid 
> byteswapping
> it over and over again.
>
>
> Signed-off-by: Barry Naujok <bnaujok at sgi.com>
> Signed-off-by: Christoph Hellwig <hch at lst.de>
>

Reviewed-by: Eric Sandeen <sandeen at sandeen.net>
> Index: xfsprogs-dev/repair/scan.c
> ===================================================================
> --- xfsprogs-dev.orig/repair/scan.c	2009-08-21 19:03:26.000000000 +0000
> +++ xfsprogs-dev/repair/scan.c	2009-08-21 19:05:32.000000000 +0000
> @@ -943,23 +943,26 @@ scan_freelist(
>  {
>  	xfs_agfl_t	*agfl;
>  	xfs_buf_t	*agflbuf;
> +	xfs_agnumber_t	agno;
>  	xfs_agblock_t	bno;
>  	int		count;
>  	int		i;
>  
> +	agno = be32_to_cpu(agf->agf_seqno);
> +
>  	if (XFS_SB_BLOCK(mp) != XFS_AGFL_BLOCK(mp) &&
> -			XFS_AGF_BLOCK(mp) != XFS_AGFL_BLOCK(mp) &&
> -			XFS_AGI_BLOCK(mp) != XFS_AGFL_BLOCK(mp))
> -		set_agbno_state(mp, be32_to_cpu(agf->agf_seqno),
> -				XFS_AGFL_BLOCK(mp), XR_E_FS_MAP);
> +	    XFS_AGF_BLOCK(mp) != XFS_AGFL_BLOCK(mp) &&
> +	    XFS_AGI_BLOCK(mp) != XFS_AGFL_BLOCK(mp))
> +		set_agbno_state(mp, agno, XFS_AGFL_BLOCK(mp), XR_E_FS_MAP);
> +
>  	if (be32_to_cpu(agf->agf_flcount) == 0)
>  		return;
> -	agflbuf = libxfs_readbuf(mp->m_dev, XFS_AG_DADDR(mp,
> -				be32_to_cpu(agf->agf_seqno),
> -				XFS_AGFL_DADDR(mp)), XFS_FSS_TO_BB(mp, 1), 0);
> +
> +	agflbuf = libxfs_readbuf(mp->m_dev,
> +				 XFS_AG_DADDR(mp, agno, XFS_AGFL_DADDR(mp)),
> +				 XFS_FSS_TO_BB(mp, 1), 0);
>  	if (!agflbuf)  {
> -		do_abort(_("can't read agfl block for ag %d\n"),
> -			be32_to_cpu(agf->agf_seqno));
> +		do_abort(_("can't read agfl block for ag %d\n"), agno);
>  		return;
>  	}
>  	agfl = XFS_BUF_TO_AGFL(agflbuf);
> @@ -967,12 +970,11 @@ scan_freelist(
>  	count = 0;
>  	for (;;) {
>  		bno = be32_to_cpu(agfl->agfl_bno[i]);
> -		if (verify_agbno(mp, be32_to_cpu(agf->agf_seqno), bno))
> -			set_agbno_state(mp, be32_to_cpu(agf->agf_seqno),
> -					bno, XR_E_FREE);
> +		if (verify_agbno(mp, agno, bno))
> +			set_agbno_state(mp, agno, bno, XR_E_FREE);
>  		else
>  			do_warn(_("bad agbno %u in agfl, agno %d\n"),
> -				bno, be32_to_cpu(agf->agf_seqno));
> +				bno, agno);
>  		count++;
>  		if (i == be32_to_cpu(agf->agf_fllast))
>  			break;
> @@ -981,8 +983,7 @@ scan_freelist(
>  	}
>  	if (count != be32_to_cpu(agf->agf_flcount)) {
>  		do_warn(_("freeblk count %d != flcount %d in ag %d\n"), count,
> -			be32_to_cpu(agf->agf_flcount),
> -			be32_to_cpu(agf->agf_seqno));
> +			be32_to_cpu(agf->agf_flcount), agno);
>  	}
>  	libxfs_putbuf(agflbuf);
>  }
>
> _______________________________________________
> xfs mailing list
> xfs at oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
>