]>
Commit | Line | Data |
---|---|---|
d033d661 GKH |
1 | From 6a7fd522a7c94cdef0a3b08acf8e6702056e635c Mon Sep 17 00:00:00 2001 |
2 | From: Vegard Nossum <vegard.nossum@oracle.com> | |
3 | Date: Mon, 4 Jul 2016 11:03:00 -0400 | |
4 | Subject: ext4: don't call ext4_should_journal_data() on the journal inode | |
5 | ||
6 | From: Vegard Nossum <vegard.nossum@oracle.com> | |
7 | ||
8 | commit 6a7fd522a7c94cdef0a3b08acf8e6702056e635c upstream. | |
9 | ||
10 | If ext4_fill_super() fails early, it's possible for ext4_evict_inode() | |
11 | to call ext4_should_journal_data() before superblock options and flags | |
12 | are fully set up. In that case, the iput() on the journal inode can | |
13 | end up causing a BUG(). | |
14 | ||
15 | Work around this problem by reordering the tests so we only call | |
16 | ext4_should_journal_data() after we know it's not the journal inode. | |
17 | ||
18 | Fixes: 2d859db3e4 ("ext4: fix data corruption in inodes with journalled data") | |
19 | Fixes: 2b405bfa84 ("ext4: fix data=journal fast mount/umount hang") | |
20 | Cc: Jan Kara <jack@suse.cz> | |
21 | Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com> | |
22 | Signed-off-by: Theodore Ts'o <tytso@mit.edu> | |
23 | Reviewed-by: Jan Kara <jack@suse.cz> | |
24 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
25 | ||
26 | --- | |
27 | fs/ext4/inode.c | 6 +++--- | |
28 | 1 file changed, 3 insertions(+), 3 deletions(-) | |
29 | ||
30 | --- a/fs/ext4/inode.c | |
31 | +++ b/fs/ext4/inode.c | |
32 | @@ -205,9 +205,9 @@ void ext4_evict_inode(struct inode *inod | |
33 | * Note that directories do not have this problem because they | |
34 | * don't use page cache. | |
35 | */ | |
36 | - if (ext4_should_journal_data(inode) && | |
37 | - (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode)) && | |
38 | - inode->i_ino != EXT4_JOURNAL_INO) { | |
39 | + if (inode->i_ino != EXT4_JOURNAL_INO && | |
40 | + ext4_should_journal_data(inode) && | |
41 | + (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode))) { | |
42 | journal_t *journal = EXT4_SB(inode->i_sb)->s_journal; | |
43 | tid_t commit_tid = EXT4_I(inode)->i_datasync_tid; | |
44 |