diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-03 20:56:25 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-03 20:56:25 +0400 |
| commit | 14a9e5c09d13aa36b88ea54b8b6134b60ff2a410 (patch) | |
| tree | 4c8c477d4e459bd3429b83a81e3db531ffe32969 /fs/ext3 | |
| parent | 8546dc1d4b671480961c3eaf4c0c102ae6848340 (diff) | |
| parent | fb1c2d8294a60184a151ff12182446d7b930ed95 (diff) | |
| download | linux-14a9e5c09d13aa36b88ea54b8b6134b60ff2a410.tar.xz | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext3/jbd fixes from Jan Kara:
"A couple of ext3/jbd fixes"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
jbd: use kmem_cache_zalloc for allocating journal head
jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
jbd: don't wait (forever) for stale tid caused by wraparound
ext3: fix data=journal fast mount/umount hang
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 d512c4bc4ad7..d706dbfa6220 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; |