From 2ed9f510e9109e57e85aa5fd2db50e5b7856ff8e Mon Sep 17 00:00:00 2001 From: Chandra Seetharaman Date: Wed, 3 Aug 2011 02:18:34 +0000 Subject: [PATCH] --- yaml --- r: 262863 b: refs/heads/master c: e570280521290c27621d60cffea2400bdf1f2c88 h: refs/heads/master i: 262861: 143d26f3b78d794bed1a1ba6d58e9be70eb57f3a 262859: 35088d20d26f067c61bdbc5b49ed01605e7bb4b2 262855: a634d1d23eb4920d0a1389d39ad5c842597db567 262847: 45f9ff58b43a03532bf82fadc86d8349fb935da5 v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_log_recover.c | 4 ++-- trunk/fs/xfs/xfs_vnodeops.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 40eb418a94cc..a34eb7cfc890 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac4d6888b21a8be373f3e06f1d4011fbe2bbbeac +refs/heads/master: e570280521290c27621d60cffea2400bdf1f2c88 diff --git a/trunk/fs/xfs/xfs_log_recover.c b/trunk/fs/xfs/xfs_log_recover.c index b9afff8a1be2..a199dbcee7d8 100644 --- a/trunk/fs/xfs/xfs_log_recover.c +++ b/trunk/fs/xfs/xfs_log_recover.c @@ -2133,7 +2133,7 @@ xlog_recover_buffer_pass2( buf_flags); if (!bp) return XFS_ERROR(ENOMEM); - error = xfs_buf_geterror(bp); + error = bp->b_error; if (error) { xfs_ioerror_alert("xlog_recover_do..(read#1)", mp, bp, buf_f->blf_blkno); @@ -2228,7 +2228,7 @@ xlog_recover_inode_pass2( error = ENOMEM; goto error; } - error = xfs_buf_geterror(bp); + error = bp->b_error; if (error) { xfs_ioerror_alert("xlog_recover_do..(read#2)", mp, bp, in_f->ilf_blkno); diff --git a/trunk/fs/xfs/xfs_vnodeops.c b/trunk/fs/xfs/xfs_vnodeops.c index 2a432d00d4c1..51fc429527bc 100644 --- a/trunk/fs/xfs/xfs_vnodeops.c +++ b/trunk/fs/xfs/xfs_vnodeops.c @@ -85,7 +85,7 @@ xfs_readlink_bmap( XBF_LOCK | XBF_MAPPED | XBF_DONT_BLOCK); if (!bp) return XFS_ERROR(ENOMEM); - error = xfs_buf_geterror(bp); + error = bp->b_error; if (error) { xfs_ioerror_alert("xfs_readlink", ip->i_mount, bp, XFS_BUF_ADDR(bp));