diff mbox

[Bug,12568] BUG: filefrag errors on non-journal ext4 filesystem

Message ID 20090130050201.08F74108040@picon.linux-foundation.org
State Accepted, archived
Headers show

Commit Message

bugme-daemon@bugzilla.kernel.org Jan. 30, 2009, 5:02 a.m. UTC

------- Comment #1 from tytso@mit.edu  2009-01-29 21:02 -------
Here's the patch to fix this issue.

                                        - Ted

From b9ec63f78b425c0e16cc95605b5d4ff2dc228b97 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 30 Jan 2009 00:00:24 -0500
Subject: [PATCH] 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.


Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
 fs/ext4/inode.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

                 * This is a REALLY heavyweight approach, but the use of
diff mbox


diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index b4386da..03ba20b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2821,9 +2821,6 @@  static sector_t ext4_bmap(struct address_space *mapping,
sector_t block)

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