Commit b9ec63f7 authored Jan 30, 2009 by Theodore Ts'o

ext4: Remove bogus BUG() check in ext4_bmap()

The code to support journal-less ext4 operation added a BUG to
ext4_bmap() which fired if there was no journal and the
EXT4_STATE_JDATA bit was set in the i_state field.  This caused
running the filefrag program (which uses the FIMBAP ioctl) to trigger
a BUG().

The EXT4_STATE_JDATA bit is only used for ext4_bmap(), and it's
harmless for the bit to be set.  We could add a check in
__ext4_journalled_writepage() and ext4_journalled_write_end() to only
set the EXT4_STATE_JDATA bit if the journal is present, but that adds
an extra test and jump instruction.  It's easier to simply remove the
BUG check.

http://bugzilla.kernel.org/show_bug.cgi?id=12568



Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org

parent 9fd9784c

fs/ext4/inode.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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

Admin message