From 5a3aa1a731d001aef63c4caa2e708851bee3a3ce Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 20 Jan 2009 09:50:19 -0500
Subject: [PATCH] --- yaml --- r: 130526 b: refs/heads/master c:
 e7f07968c16bdd9480001c0a9de013ba56889cf9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7ef24b5703b4..09b7bfece71f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08ec8c3878cea0bf91f2ba3c0badf44b383752d0
+refs/heads/master: e7f07968c16bdd9480001c0a9de013ba56889cf9
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index 49484ba801c9..b4386dafeb0c 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -3622,7 +3622,7 @@ static void ext4_free_data(handle_t *handle, struct inode *inode,
 		 * block pointed to itself, it would have been detached when
 		 * the block was cleared. Check for this instead of OOPSing.
 		 */
-		if (bh2jh(this_bh))
+		if ((EXT4_JOURNAL(inode) == NULL) || bh2jh(this_bh))
 			ext4_handle_dirty_metadata(handle, inode, this_bh);
 		else
 			ext4_error(inode->i_sb, __func__,