summaryrefslogtreecommitdiffstats
path: root/fs/ext4/ext4_jbd2.c
diff options
context:
space:
mode:
authorCurt Wohlgemuth <curtw@google.com>2010-02-16 21:06:29 +0100
committerTheodore Ts'o <tytso@mit.edu>2010-02-16 21:06:29 +0100
commit73b50c1c92666d326b5fa2c945d46509f2f6d91f (patch)
tree87e2cc6fed3259a83364ede33d8f4d68173f8175 /fs/ext4/ext4_jbd2.c
parentjbd2: delay discarding buffers in journal_unmap_buffer (diff)
downloadlinux-73b50c1c92666d326b5fa2c945d46509f2f6d91f.tar.xz
linux-73b50c1c92666d326b5fa2c945d46509f2f6d91f.zip
ext4: Fix BUG_ON at fs/buffer.c:652 in no journal mode
Calls to ext4_handle_dirty_metadata should only pass in an inode pointer for inode-specific metadata, and not for shared metadata blocks such as inode table blocks, block group descriptors, the superblock, etc. The BUG_ON can get tripped when updating a special device (such as a block device) that is opened (so that i_mapping is set in fs/block_dev.c) and the file system is mounted in no journal mode. Addresses-Google-Bug: #2404870 Signed-off-by: Curt Wohlgemuth <curtw@google.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/ext4_jbd2.c')
-rw-r--r--fs/ext4/ext4_jbd2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
index 2f407c487e6b..53d2764d71ca 100644
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -125,7 +125,7 @@ int __ext4_handle_dirty_metadata(const char *where, handle_t *handle,
ext4_journal_abort_handle(where, __func__, bh,
handle, err);
} else {
- if (inode && bh)
+ if (inode)
mark_buffer_dirty_inode(bh, inode);
else
mark_buffer_dirty(bh);