On Thu, 2011-07-21 at 17:32 -0700, Chandra Seetharaman wrote:
> Remove the definitions and usage of the macros XFS_BUF_ERROR,
> XFS_BUF_GETERROR and XFS_BUF_ISERROR.
>
> Signed-off-by: Chandra Seetharaman <sekharan@xxxxxxxxxx>
Nice work on this. It is clear it was thoughtfully
done.
I have two things that need to be fixed. If you do that
you can consider this signed off by me.
Reviewed-by: Alex Elder <aelder@xxxxxxx>
. . .
> diff --git a/fs/xfs/quota/xfs_dquot.c b/fs/xfs/quota/xfs_dquot.c
> index 837f311..e7e35fb 100644
> --- a/fs/xfs/quota/xfs_dquot.c
> +++ b/fs/xfs/quota/xfs_dquot.c
> @@ -403,7 +403,8 @@ xfs_qm_dqalloc(
> dqp->q_blkno,
> mp->m_quotainfo->qi_dqchunklen,
> 0);
> - if (!bp || (error = XFS_BUF_GETERROR(bp)))
> + error = xfs_buf_geterror(bp);
> + if (error)
> goto error1;
> /*
> * Make a chunk of dquots out of this buffer and log
This results in behavior that differs from before.
Previously, error would have value 0 following
the call to xfs_trans_get_buf() here, meaning that
(at error1:) xfs_qm_dqalloc() would return 0 in
this case. Now it will return ENOMEM.
I think what you have done may be correct, but
since the change does more than the simple
macro transformation you intend, this change
should be done in a separate commit.
So either:
- post a new patch (preferably before this
whole series) that makes this code return
ENOMEM if xfs_trans_get_buf() returns a
null pointer, then update this patch accordingly;
- or just change this patch to return 0 instead
of ENOMEM if xfs_trans_get_buf() returns a
null pointer.
. . .
> diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
> index 88d1214..97daa35 100644
> --- a/fs/xfs/xfs_vnodeops.c
> +++ b/fs/xfs/xfs_vnodeops.c
> @@ -83,7 +83,7 @@ xfs_readlink_bmap(
>
> bp = xfs_buf_read(mp->m_ddev_targp, d, BTOBB(byte_cnt),
> XBF_LOCK | XBF_MAPPED | XBF_DONT_BLOCK);
xfs_buf_read() can return NULL here, so to match
the existing behavior you should call xfs_buf_geterror()
here.
> - error = XFS_BUF_GETERROR(bp);
> + error = bp->b_error;
> if (error) {
> xfs_ioerror_alert("xfs_readlink",
> ip->i_mount, bp, XFS_BUF_ADDR(bp));
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
