diff --git a/[refs] b/[refs]
index b10fa62a62ac..c0b108001942 100644
--- 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
index cac448282331..8990165346ee 100644
--- 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);