From 3a88300cf0cc360f44961320379fe41304899820 Mon Sep 17 00:00:00 2001
From: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Date: Fri, 12 Dec 2008 15:28:02 +1100
Subject: [PATCH] --- yaml --- r: 124954 b: refs/heads/master c:
 4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/fs/xfs/linux-2.6/xfs_buf.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2fc349469993..40c476ebc837 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4cd747ee6c3ba1e7727878e3fce482d0d8c0136
+refs/heads/master: 4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6
diff --git a/trunk/fs/xfs/linux-2.6/xfs_buf.c b/trunk/fs/xfs/linux-2.6/xfs_buf.c
index b9c304a629ee..cb329edc925b 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_buf.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_buf.c
@@ -1126,8 +1126,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;