diff --git a/[refs] b/[refs]
index a1a77f4c677f..042ea7aca574 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae76dd9a6b5bbe5315fb7028e03f68f75b8538f3
+refs/heads/master: 95450f5a7e53d5752ce1a0d0b8282e10fe745ae0
diff --git a/trunk/fs/ext3/inode.c b/trunk/fs/ext3/inode.c
index 74b432fa166b..36f74f17a11c 100644
--- a/trunk/fs/ext3/inode.c
+++ b/trunk/fs/ext3/inode.c
@@ -2521,6 +2521,16 @@ static int __ext3_get_inode_loc(struct inode *inode,
 	}
 	if (!buffer_uptodate(bh)) {
 		lock_buffer(bh);
+
+		/*
+		 * If the buffer has the write error flag, we have failed
+		 * to write out another inode in the same block.  In this
+		 * case, we don't have to read the block because we may
+		 * read the old inode data successfully.
+		 */
+		if (buffer_write_io_error(bh) && !buffer_uptodate(bh))
+			set_buffer_uptodate(bh);
+
 		if (buffer_uptodate(bh)) {
 			/* someone brought it uptodate while we waited */
 			unlock_buffer(bh);