Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Jan 2013 17:57:34 +0000 (09:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Jan 2013 17:57:34 +0000 (09:57 -0800)
commit5439ca6b8ff8cf8d758c19eb28b617a5912904ee
tree676f9e0b25074d2d8c5ab29df30c962b3cb7311e
parenta7a88b23737095e6c18a20c5d4eef9e25ec5b829
parent0e9a9a1ad619e7e987815d20262d36a2f95717ca
Merge tag 'ext4_for_linus' of git://git./linux/kernel/git/tytso/ext4

Pull ext4 bug fixes from Ted Ts'o:
 "Various bug fixes for ext4.  Perhaps the most serious bug fixed is one
  which could cause file system corruptions when performing file punch
  operations."

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: avoid hang when mounting non-journal filesystems with orphan list
  ext4: lock i_mutex when truncating orphan inodes
  ext4: do not try to write superblock on ro remount w/o journal
  ext4: include journal blocks in df overhead calcs
  ext4: remove unaligned AIO warning printk
  ext4: fix an incorrect comment about i_mutex
  ext4: fix deadlock in journal_unmap_buffer()
  ext4: split off ext4_journalled_invalidatepage()
  jbd2: fix assertion failure in jbd2_journal_flush()
  ext4: check dioread_nolock on remount
  ext4: fix extent tree corruption caused by hole punch
fs/ext4/file.c
fs/jbd2/transaction.c