On Wed, Oct 18, 2006 at 01:58:52PM +0530, Amol Lad wrote:
> --- linux-2.6.19-rc2-orig/fs/xfs/xfs_btree.h 2006-10-18 09:29:18.000000000
> +0530
> +++ linux-2.6.19-rc2/fs/xfs/xfs_btree.h 2006-10-18 11:25:46.000000000
> +0530
> @@ -18,6 +18,8 @@
> #ifndef __XFS_BTREE_H__
> #define __XFS_BTREE_H__
>
> +#include <linux/kernel.h>
> +
This file is also used in libxfs, so you can't just include this header
directly. On the other hand it should always get kernel.h through
xfs_linux.h anyway so you might aswell just leave the include out.
> +#define XFS_EXTLEN_MIN(a,b) (min_t(xfs_extlen_t,a,b))
> +#define XFS_EXTLEN_MAX(a,b) (max_t(xfs_extlen_t,a,b))
> +#define XFS_AGBLOCK_MIN(a,b) (min_t(xfs_agblock_t,a,b))
> +#define XFS_AGBLOCK_MAX(a,b) (max_t(xfs_agblock_t,a,b))
> +#define XFS_FILEOFF_MIN(a,b) (min_t(xfs_fileoff_t,a,b))
> +#define XFS_FILEOFF_MAX(a,b) (max_t(xfs_fileoff_t,a,b))
> +#define XFS_FILBLKS_MIN(a,b) (min_t(xfs_filblks_t,a,b))
> +#define XFS_FILBLKS_MAX(a,b) (max_t(xfs_filblks_t,a,b))
At this point we might aswell kill these UGLY SHOUTING macros and
use min_t/max_t (or just min/max where appropinquate) directly.
> error = xfs_rtallocate_extent_block(mp, tp, i,
> - XFS_RTMAX(minlen, 1 << l),
> - XFS_RTMIN(maxlen, (1 << (l + 1)) - 1),
> + max(minlen, (xfs_extlen_t)(1 << l)),
> + min(maxlen, (xfs_extlen_t)((1 << (l +
> 1)) - 1)),
these would be a lot more readable as
max_t(xfs_extlen_t, minlen, (1 << l)),
min_t(xfs_extlen_t, maxlen,
((1 << (l + 1)) - 1)),
wouldn, it?
> - lastbit = XFS_RTMIN(bit + len, XFS_NBWORD);
> + lastbit = min(bit + len, (xfs_extlen_t)XFS_NBWORD);
> - firstbit = XFS_RTMAX((xfs_srtblock_t)(bit - len + 1), 0);
> + firstbit = max((xfs_srtblock_t)(bit - len + 1),
> (xfs_srtblock_t)0);
> - lastbit = XFS_RTMIN(bit + len, XFS_NBWORD);
> + lastbit = min(bit + len, (xfs_rtblock_t)XFS_NBWORD);
> - lastbit = XFS_RTMIN(bit + len, XFS_NBWORD);
> + lastbit = min(bit + len, (xfs_extlen_t)XFS_NBWORD);
> - XFS_RTMIN(nrblocks,
> - nsbp->sb_rbmblocks * NBBY *
> - nsbp->sb_blocksize * nsbp->sb_rextsize);
> + min(nrblocks,
> + (xfs_drfsbno_t)(nsbp->sb_rbmblocks * NBBY *
> + nsbp->sb_blocksize * nsbp->sb_rextsize));
ditto
|