Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

Pull ext4 updates from Ted Ts'o:
 "A large number of bug fixes and cleanups.

  One new feature to allow users to more easily find the jbd2 journal
  thread for a particular ext4 file system"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (25 commits)
  jbd2: jbd2_get_transaction does not need to return a value
  jbd2: fix invalid descriptor block checksum
  ext4: fix bigalloc cluster freeing when hole punching under load
  ext4: add sysfs attr /sys/fs/ext4/<disk>/journal_task
  ext4: Change debugging support help prefix from EXT4 to Ext4
  ext4: fix compile error when using BUFFER_TRACE
  jbd2: fix compile warning when using JBUFFER_TRACE
  ext4: fix some error pointer dereferences
  ext4: annotate more implicit fall throughs
  ext4: annotate implicit fall throughs
  ext4: don't update s_rev_level if not required
  jbd2: fold jbd2_superblock_csum_{verify,set} into their callers
  jbd2: fix race when writing superblock
  ext4: fix crash during online resizing
  ext4: disallow files with EXT4_JOURNAL_DATA_FL from EXT4_IOC_SWAP_BOOT
  ext4: add mask of ext4 flags to swap
  ext4: update quota information while swapping boot loader inode
  ext4: cleanup pagecache before swap i_data
  ext4: fix check of inode in swap_inode_boot_loader
  ext4: unlock unused_pages timely when doing writeback
  ...

diff --cc fs/ext4/Kconfig
index 031e5a82d556dbe9d4bd2cff39d1b8c4e162b659,112b475f6981a102a2e6ba9f0c17430c02e712e0..06f77ca7f36ee737018016883df254948b5851e7
--- 1/fs/ext4/Kconfig
--- 2/fs/ext4/Kconfig
+++ b/fs/ext4/Kconfig
@@@ -96,8 -96,23 +96,8 @@@ config EXT4_FS_SECURIT
          If you are not using a security module that requires using
          extended attributes for file security labels, say N.
  
 -config EXT4_ENCRYPTION
 -      bool "Ext4 Encryption"
 -      depends on EXT4_FS
 -      select FS_ENCRYPTION
 -      help
 -        Enable encryption of ext4 files and directories.  This
 -        feature is similar to ecryptfs, but it is more memory
 -        efficient since it avoids caching the encrypted and
 -        decrypted pages in the page cache.
 -
 -config EXT4_FS_ENCRYPTION
 -      bool
 -      default y
 -      depends on EXT4_ENCRYPTION
 -
  config EXT4_DEBUG
-       bool "EXT4 debugging support"
+       bool "Ext4 debugging support"
        depends on EXT4_FS
        help
          Enables run-time debugging support for the ext4 filesystem.

diff --cc fs/ext4/ext4.h
Simple merge

diff --cc fs/ext4/extents.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/ioctl.c
Simple merge

diff --cc fs/ext4/page-io.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/ext4/sysfs.c
Simple merge