From 236016b7207fb3b95e92e3233a57d0430889726b Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 27 Dec 2012 01:42:50 -0500
Subject: [PATCH] --- yaml --- r: 348109 b: refs/heads/master c:
 0e9a9a1ad619e7e987815d20262d36a2f95717ca h: refs/heads/master i:   348107:
 cfa6b2dbd6cd211ba839d920ab9b11eab14274d5 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/namei.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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);