From 2571ef04acfba89a180bfeb5b103fbc57bfb847d Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Tue, 8 Nov 2011 08:56:15 +0000
Subject: [PATCH] --- yaml --- r: 275243 b: refs/heads/master c:
 810627d9a6d0e8820c798001875bc4e1b7754ebf h: refs/heads/master i:   275241:
 ad1a13e3cd9c75fa315534230be7089ab4dcd91e   275239:
 124bfe88e47c83052fce811122e5913005de4b02 v: v3

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

diff --git a/[refs] b/[refs]
index 839126c0d07c..2131cda9f813 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 272e42b215c52d32e06bf035c1f6b70baa6716bd
+refs/heads/master: 810627d9a6d0e8820c798001875bc4e1b7754ebf
diff --git a/trunk/fs/xfs/xfs_aops.c b/trunk/fs/xfs/xfs_aops.c
index 33b13310ee0c..574d4ee9b625 100644
--- a/trunk/fs/xfs/xfs_aops.c
+++ b/trunk/fs/xfs/xfs_aops.c
@@ -189,7 +189,7 @@ xfs_end_io(
 	int		error = 0;
 
 	if (XFS_FORCED_SHUTDOWN(ip->i_mount)) {
-		error = -EIO;
+		ioend->io_error = -EIO;
 		goto done;
 	}
 	if (ioend->io_error)