ext4: don't call ext4_should_journal_data() on the journal inode
authorVegard Nossum <vegard.nossum@oracle.com>
Mon, 4 Jul 2016 15:03:00 +0000 (11:03 -0400)
committerWilly Tarreau <w@1wt.eu>
Sun, 21 Aug 2016 21:22:49 +0000 (23:22 +0200)
commit8b6ab35cbc581ab0eb74425d92e35e9522382121
tree9f3f6510efd72a82233ca9e44231fcedda7e9fe5
parent6dc68acbb65e2336d6f8b35c2f0c9a4219d3adf2
ext4: don't call ext4_should_journal_data() on the journal inode

commit 6a7fd522a7c94cdef0a3b08acf8e6702056e635c upstream.

If ext4_fill_super() fails early, it's possible for ext4_evict_inode()
to call ext4_should_journal_data() before superblock options and flags
are fully set up.  In that case, the iput() on the journal inode can
end up causing a BUG().

Work around this problem by reordering the tests so we only call
ext4_should_journal_data() after we know it's not the journal inode.

Fixes: 2d859db3e4 ("ext4: fix data corruption in inodes with journalled data")
Fixes: 2b405bfa84 ("ext4: fix data=journal fast mount/umount hang")
Cc: Jan Kara <jack@suse.cz>
Cc: stable@vger.kernel.org
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Willy Tarreau <w@1wt.eu>
fs/ext4/inode.c