---

yaml --- r: 348109 b: refs/heads/master c: 0e9a9a1 h: refs/heads/master i: 348107: cfa6b2d v: v3
git-mirror · Dec 27, 2012 · 236016b · 236016b
1 parent c3ac5e1
commit 236016b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 721e3eba21e43532e438652dd8f1fcdfce3187e7
+refs/heads/master: 0e9a9a1ad619e7e987815d20262d36a2f95717ca
diff --git a/trunk/fs/ext4/namei.c b/trunk/fs/ext4/namei.c
@@ -2648,7 +2648,8 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode)
 	struct ext4_iloc iloc;
 	int err = 0;
 
-	if (!EXT4_SB(inode->i_sb)->s_journal)
+	if ((!EXT4_SB(inode->i_sb)->s_journal) &&
+	    !(EXT4_SB(inode->i_sb)->s_mount_state & EXT4_ORPHAN_FS))
 		return 0;
 
 	mutex_lock(&EXT4_SB(inode->i_sb)->s_orphan_lock);