5f94d17
parent 25389bb207987b5774182f763b9fb65ff08761c8
author Linus Torvalds <torvalds@linux-foundation.org> 1353980527 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1353980527 -0800

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull ext3 regression fix from Jan Kara:
 "Fix an ext3 regression introduced during 3.7 merge window.  It leads
  to deadlock if you stress the filesystem in the right way (luckily
  only if blocksize < pagesize)."

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  jbd: Fix lock ordering bug in journal_unmap_buffer()
P¬òF”7x