aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/linux-2.6/xfs_buf.c
diff options
context:
space:
mode:
authorChandra Seetharaman <sekharan@us.ibm.com>2011-07-22 19:39:51 -0400
committerAlex Elder <aelder@sgi.com>2011-07-25 15:57:46 -0400
commit5a52c2a581cddcb676a54a95d99cd39f5577c33b (patch)
tree085825ca21b17d566e588428fa0aa2063ba4f1a4 /fs/xfs/linux-2.6/xfs_buf.c
parented43233be910bbc8b9da3d61aa1b931843d1b44e (diff)
xfs: Remove the macro XFS_BUF_ERROR and family
Remove the definitions and usage of the macros XFS_BUF_ERROR, XFS_BUF_GETERROR and XFS_BUF_ISERROR. Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_buf.c')
-rw-r--r--fs/xfs/linux-2.6/xfs_buf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index 969fd151024c..704418a04991 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -596,7 +596,7 @@ _xfs_buf_read(
596 bp->b_flags |= flags & (XBF_READ | XBF_ASYNC | XBF_READ_AHEAD); 596 bp->b_flags |= flags & (XBF_READ | XBF_ASYNC | XBF_READ_AHEAD);
597 597
598 status = xfs_buf_iorequest(bp); 598 status = xfs_buf_iorequest(bp);
599 if (status || XFS_BUF_ISERROR(bp) || (flags & XBF_ASYNC)) 599 if (status || bp->b_error || (flags & XBF_ASYNC))
600 return status; 600 return status;
601 return xfs_buf_iowait(bp); 601 return xfs_buf_iowait(bp);
602} 602}
@@ -1069,7 +1069,7 @@ xfs_bioerror(
1069 /* 1069 /*
1070 * No need to wait until the buffer is unpinned, we aren't flushing it. 1070 * No need to wait until the buffer is unpinned, we aren't flushing it.
1071 */ 1071 */
1072 XFS_BUF_ERROR(bp, EIO); 1072 xfs_buf_ioerror(bp, EIO);
1073 1073
1074 /* 1074 /*
1075 * We're calling xfs_buf_ioend, so delete XBF_DONE flag. 1075 * We're calling xfs_buf_ioend, so delete XBF_DONE flag.
@@ -1115,7 +1115,7 @@ xfs_bioerror_relse(
1115 * There's no reason to mark error for 1115 * There's no reason to mark error for
1116 * ASYNC buffers. 1116 * ASYNC buffers.
1117 */ 1117 */
1118 XFS_BUF_ERROR(bp, EIO); 1118 xfs_buf_ioerror(bp, EIO);
1119 XFS_BUF_FINISH_IOWAIT(bp); 1119 XFS_BUF_FINISH_IOWAIT(bp);
1120 } else { 1120 } else {
1121 xfs_buf_relse(bp); 1121 xfs_buf_relse(bp);