diff options
| author | Jan Kara <jack@suse.cz> | 2013-05-03 11:41:39 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2013-05-03 11:41:39 +0200 |
| commit | fb1c2d8294a60184a151ff12182446d7b930ed95 (patch) | |
| tree | 4414bcf352831d84ff0ed40f694e96016ffb98cc /fs/ext3 | |
| parent | 35e5cbc0af240778e61113286c019837e06aeec6 (diff) | |
| parent | 8bb9da943a62f4ffaabba1ad745990260fbb39df (diff) | |
| download | op-kernel-dev-fb1c2d8294a60184a151ff12182446d7b930ed95.zip op-kernel-dev-fb1c2d8294a60184a151ff12182446d7b930ed95.tar.gz | |
Merge branch 'for_next' into for_linus
Diffstat (limited to 'fs/ext3')
| -rw-r--r-- | fs/ext3/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index d512c4b..d706dbf 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c @@ -218,7 +218,8 @@ void ext3_evict_inode (struct inode *inode) */ if (inode->i_nlink && ext3_should_journal_data(inode) && EXT3_SB(inode->i_sb)->s_journal && - (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode))) { + (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode)) && + inode->i_ino != EXT3_JOURNAL_INO) { tid_t commit_tid = atomic_read(&ei->i_datasync_tid); journal_t *journal = EXT3_SB(inode->i_sb)->s_journal; |
