diff --git a/[refs] b/[refs]
index 273ef753e202..91f78459f94e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fd9784c91db79e953ea3fe3741f885bdc390a72
+refs/heads/master: b9ec63f78b425c0e16cc95605b5d4ff2dc228b97
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index b4386dafeb0c..03ba20be1329 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -2821,9 +2821,6 @@ static sector_t ext4_bmap(struct address_space *mapping, sector_t block)
 		filemap_write_and_wait(mapping);
 	}
 
-	BUG_ON(!EXT4_JOURNAL(inode) &&
-	       EXT4_I(inode)->i_state & EXT4_STATE_JDATA);
-
 	if (EXT4_JOURNAL(inode) && EXT4_I(inode)->i_state & EXT4_STATE_JDATA) {
 		/*
 		 * This is a REALLY heavyweight approach, but the use of