---

yaml
---
r: 185871
b: refs/heads/master
c: 6e3617e
h: refs/heads/master
i:
  185869: a6ec659
  185867: abe8101
  185863: f869226
  185855: 38d116d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da1dafca84413145f5ac59998b4cdd06fb89f721
+refs/heads/master: 6e3617e579e070d3655a93ee9ed7149113e795e0

trunk/fs/ext4/namei.c

@@ -2013,6 +2013,13 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode)
 	err = ext4_reserve_inode_write(handle, inode, &iloc);
 	if (err)
 		goto out_unlock;
+	/*
+	 * Due to previous errors inode may be already a part of on-disk
+	 * orphan list. If so skip on-disk list modification.
+	 */
+	if (NEXT_ORPHAN(inode) && NEXT_ORPHAN(inode) <=
+		(le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count)))
+			goto mem_insert;
 
 	/* Insert this inode at the head of the on-disk orphan list... */
 	NEXT_ORPHAN(inode) = le32_to_cpu(EXT4_SB(sb)->s_es->s_last_orphan);
@@ -2030,6 +2037,7 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode)
 	 *
 	 * This is safe: on error we're going to ignore the orphan list
 	 * anyway on the next recovery. */
+mem_insert:
 	if (!err)
 		list_add(&EXT4_I(inode)->i_orphan, &EXT4_SB(sb)->s_orphan);