]> www.infradead.org Git - users/jedix/linux-maple.git/commit
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)
committerDhaval Giani <dhaval.giani@oracle.com>
Fri, 20 Jan 2017 22:22:06 +0000 (17:22 -0500)
commit5663c9796a4169876ab64fcb3c5c756bde8bb3c5
treedf65fa5b95f4f2fd89afab5bf24e33c61006748d
parent4454919238de885938859f214f7d5b486aaaf2e8
ext4: don't call ext4_should_journal_data() on the journal inode

Orabug: 25308118

[ Upstream commit 6a7fd522a7c94cdef0a3b08acf8e6702056e635c ]

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: Sasha Levin <alexander.levin@verizon.com>
(cherry picked from commit e19f0ec5aeb659cb7dd2bf6e4f1e842f5ad71fcf)
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
fs/ext4/inode.c