diff options
author | Chandra Seetharaman <sekharan@us.ibm.com> | 2011-08-02 22:18:34 -0400 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2011-08-12 14:39:40 -0400 |
commit | e570280521290c27621d60cffea2400bdf1f2c88 (patch) | |
tree | 4cf24cfa20ecef67b2aafa2309d04a137ecfbe4a | |
parent | ac4d6888b21a8be373f3e06f1d4011fbe2bbbeac (diff) |
xfs: replace xfs_buf_geterror() with bp->b_error
Since we just checked bp for NULL, it is ok to replace
xfs_buf_geterror() with bp->b_error in these places.
Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
-rw-r--r-- | fs/xfs/xfs_log_recover.c | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_vnodeops.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index b9afff8a1be2..a199dbcee7d8 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
@@ -2133,7 +2133,7 @@ xlog_recover_buffer_pass2( | |||
2133 | buf_flags); | 2133 | buf_flags); |
2134 | if (!bp) | 2134 | if (!bp) |
2135 | return XFS_ERROR(ENOMEM); | 2135 | return XFS_ERROR(ENOMEM); |
2136 | error = xfs_buf_geterror(bp); | 2136 | error = bp->b_error; |
2137 | if (error) { | 2137 | if (error) { |
2138 | xfs_ioerror_alert("xlog_recover_do..(read#1)", mp, | 2138 | xfs_ioerror_alert("xlog_recover_do..(read#1)", mp, |
2139 | bp, buf_f->blf_blkno); | 2139 | bp, buf_f->blf_blkno); |
@@ -2228,7 +2228,7 @@ xlog_recover_inode_pass2( | |||
2228 | error = ENOMEM; | 2228 | error = ENOMEM; |
2229 | goto error; | 2229 | goto error; |
2230 | } | 2230 | } |
2231 | error = xfs_buf_geterror(bp); | 2231 | error = bp->b_error; |
2232 | if (error) { | 2232 | if (error) { |
2233 | xfs_ioerror_alert("xlog_recover_do..(read#2)", mp, | 2233 | xfs_ioerror_alert("xlog_recover_do..(read#2)", mp, |
2234 | bp, in_f->ilf_blkno); | 2234 | bp, in_f->ilf_blkno); |
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 2a432d00d4c1..51fc429527bc 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -85,7 +85,7 @@ xfs_readlink_bmap( | |||
85 | XBF_LOCK | XBF_MAPPED | XBF_DONT_BLOCK); | 85 | XBF_LOCK | XBF_MAPPED | XBF_DONT_BLOCK); |
86 | if (!bp) | 86 | if (!bp) |
87 | return XFS_ERROR(ENOMEM); | 87 | return XFS_ERROR(ENOMEM); |
88 | error = xfs_buf_geterror(bp); | 88 | error = bp->b_error; |
89 | if (error) { | 89 | if (error) { |
90 | xfs_ioerror_alert("xfs_readlink", | 90 | xfs_ioerror_alert("xfs_readlink", |
91 | ip->i_mount, bp, XFS_BUF_ADDR(bp)); | 91 | ip->i_mount, bp, XFS_BUF_ADDR(bp)); |