tree 4c8c477d4e459bd3429b83a81e3db531ffe32969
parent 8546dc1d4b671480961c3eaf4c0c102ae6848340
parent fb1c2d8294a60184a151ff12182446d7b930ed95
author Linus Torvalds <torvalds@linux-foundation.org> 1367600185 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1367600185 -0700

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