summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-12-12 15:27:25 +1100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-02-12 09:50:37 -0800
commited9b1d5568deee0f1f07205259fb37553fe18eff (patch)
tree09bbdf4e5245b00c921c73c2efc3a9d8672e1911 /fs
parenta2926858cfb4fd673618988f37a9dc26c5182377 (diff)
downloadlwn-ed9b1d5568deee0f1f07205259fb37553fe18eff.tar.gz
lwn-ed9b1d5568deee0f1f07205259fb37553fe18eff.zip
XFS: set b_error from bio error in xfs_buf_bio_end_io
commit cfbe52672fbc6f333892e8dde82c35e0a76aa5f5 upstream. Preserve any error returned by the bio layer. Reviewed-by: Eric Sandeen <sandeen@sandeen.net> Reviewed-by: Tim Shimmin <tes@sgi.com> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com> Cc: Neil Brown <neilb@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/linux-2.6/xfs_buf.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index 36d5fcd3f593..8454dee16833 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -1114,8 +1114,7 @@ xfs_buf_bio_end_io(
unsigned int blocksize = bp->b_target->bt_bsize;
struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1;
- if (!test_bit(BIO_UPTODATE, &bio->bi_flags))
- bp->b_error = EIO;
+ xfs_buf_ioerror(bp, -error);
do {
struct page *page = bvec->bv_page;