---

yaml
---
r: 107535
b: refs/heads/master
c: 9c83a92
h: refs/heads/master
i:
  107533: 3ee59c8
  107531: 89d63cb
  107527: 04b3b9a
  107519: 6a6a436
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6be2ded1d7c51b39144b9f07d2c839e1bd8707f1
+refs/heads/master: 9c83a923c67df311c467ec956009f0eb4019195d

trunk/fs/ext4/inode.c

@@ -3590,6 +3590,16 @@ static int __ext4_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);