mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
ext4: don't call ext4_should_journal_data() on the journal inode
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>
This commit is contained in:
parent
4743f83990
commit
6a7fd522a7
1 changed files with 3 additions and 3 deletions
|
@ -211,9 +211,9 @@ void ext4_evict_inode(struct inode *inode)
|
||||||
* Note that directories do not have this problem because they
|
* Note that directories do not have this problem because they
|
||||||
* don't use page cache.
|
* don't use page cache.
|
||||||
*/
|
*/
|
||||||
if (ext4_should_journal_data(inode) &&
|
if (inode->i_ino != EXT4_JOURNAL_INO &&
|
||||||
(S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode)) &&
|
ext4_should_journal_data(inode) &&
|
||||||
inode->i_ino != EXT4_JOURNAL_INO) {
|
(S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode))) {
|
||||||
journal_t *journal = EXT4_SB(inode->i_sb)->s_journal;
|
journal_t *journal = EXT4_SB(inode->i_sb)->s_journal;
|
||||||
tid_t commit_tid = EXT4_I(inode)->i_datasync_tid;
|
tid_t commit_tid = EXT4_I(inode)->i_datasync_tid;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue