diff --git a/[refs] b/[refs] index 07ecbca6e73a..bda7c2883ca8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ada47d9468fe3907f7f9e00179168f5e2f90803 +refs/heads/master: 2b405bfa84063bfa35621d2d6879f52693c614b0 diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index ea5f24ffa60c..85e41a2a39ad 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -205,7 +205,8 @@ void ext4_evict_inode(struct inode *inode) * don't use page cache. */ if (ext4_should_journal_data(inode) && - (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode))) { + (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode)) && + inode->i_ino != EXT4_JOURNAL_INO) { journal_t *journal = EXT4_SB(inode->i_sb)->s_journal; tid_t commit_tid = EXT4_I(inode)->i_datasync_tid;