---

yaml --- r: 130526 b: refs/heads/master c: e7f0796 h: refs/heads/master v: v3
git-mirror · Jan 20, 2009 · 5a3aa1a · 5a3aa1a
1 parent 30f1c54
commit 5a3aa1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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__,