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

Pull ext4 bugfixes from Ted Ts'o:
 "These changes contains a fix for overlayfs interacting with some
  (badly behaved) dentry code in various file systems.  These have been
  reviewed by Al and the respective file system mtinainers and are going
  through the ext4 tree for convenience.

  This also has a few ext4 encryption bug fixes that were discovered in
  Android testing (yes, we will need to get these sync'ed up with the
  fs/crypto code; I'll take care of that).  It also has some bug fixes
  and a change to ignore the legacy quota options to allow for xfstests
  regression testing of ext4's internal quota feature and to be more
  consistent with how xfs handles this case"

* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: ignore quota mount options if the quota feature is enabled
  ext4 crypto: fix some error handling
  ext4: avoid calling dquot_get_next_id() if quota is not enabled
  ext4: retry block allocation for failed DIO and DAX writes
  ext4: add lockdep annotations for i_data_sem
  ext4: allow readdir()'s of large empty directories to be interrupted
  btrfs: fix crash/invalid memory access on fsync when using overlayfs
  ext4 crypto: use dget_parent() in ext4_d_revalidate()
  ext4: use file_dentry()
  ext4: use dget_parent() in ext4_file_open()
  nfs: use file_dentry()
  fs: add file_dentry()
  ext4 crypto: don't let data integrity writebacks fail with ENOMEM
  ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea()

diff --cc fs/btrfs/file.c
Simple merge

diff --cc fs/ext4/crypto.c
index 2580ef3346caf6c40448271ea4e5313a17f3eed1,ea69ce4f6d8f71bef001356ffcf8941f79fc0aef..db9ae6e18154d851126d9b9ca4785af012893a2d
--- 1/fs/ext4/crypto.c
--- 2/fs/ext4/crypto.c
+++ b/fs/ext4/crypto.c
@@@ -396,9 -400,9 +400,9 @@@ int ext4_encrypted_zeroout(struct inod
                 (unsigned long) inode->i_ino, lblk, len);
  #endif
  
 -      BUG_ON(inode->i_sb->s_blocksize != PAGE_CACHE_SIZE);
 +      BUG_ON(inode->i_sb->s_blocksize != PAGE_SIZE);
  
-       ctx = ext4_get_crypto_ctx(inode);
+       ctx = ext4_get_crypto_ctx(inode, GFP_NOFS);
        if (IS_ERR(ctx))
                return PTR_ERR(ctx);
  

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

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

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

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

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

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

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

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

diff --cc fs/nfs/dir.c
Simple merge

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

diff --cc fs/nfs/nfs4file.c
Simple merge

diff --cc include/linux/fs.h
Simple merge