| commit | 87726c334bf11188260a3af90a6ccbfe907498cb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 26 17:42:07 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 26 17:42:07 2012 -0800 |
| tree | cc6ef138e30e892cad9aabf732cdbb1762058fd2 | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 [diff] | |
| parent | 25389bb207987b5774182f763b9fb65ff08761c8 [diff] |
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()