Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94dd8b9a authored by Vegard Nossum's avatar Vegard Nossum Committed by Sasha Levin
Browse files

ext4: don't call ext4_should_journal_data() on the journal inode 



[ 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: 2d859db3 ("ext4: fix data corruption in inodes with journalled data")
Fixes: 2b405bfa ("ext4: fix data=journal fast mount/umount hang")
Cc: Jan Kara <jack@suse.cz>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarVegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent aba6b2d8

fs/ext4/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -207,9 +207,9 @@ void ext4_evict_inode(struct inode *inode) 
		 * Note that directories do not have this problem because they

		 * don't use page cache.

		 */

		if (ext4_should_journal_data(inode) &&

		    (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode)) &&

		    inode->i_ino != EXT4_JOURNAL_INO) {

		if (inode->i_ino != EXT4_JOURNAL_INO &&

		    ext4_should_journal_data(inode) &&

		    (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode))) {

			journal_t *journal = EXT4_SB(inode->i_sb)->s_journal;

			tid_t commit_tid = EXT4_I(inode)->i_datasync_tid;