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

Pull ext4 updates from Ted Ts'o:
 "Some locking and page fault bug fixes from Jan Kara, some ext4
  encryption fixes from me, and Li Xi's Project Quota commits"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  fs: clean up the flags definition in uapi/linux/fs.h
  ext4: add FS_IOC_FSSETXATTR/FS_IOC_FSGETXATTR interface support
  ext4: add project quota support
  ext4: adds project ID support
  ext4 crypto: simplify interfaces to directory entry insert functions
  ext4 crypto: add missing locking for keyring_key access
  ext4: use pre-zeroed blocks for DAX page faults
  ext4: implement allocation of pre-zeroed blocks
  ext4: provide ext4_issue_zeroout()
  ext4: get rid of EXT4_GET_BLOCKS_NO_LOCK flag
  ext4: document lock ordering
  ext4: fix races of writeback with punch hole and zero range
  ext4: fix races between buffered IO and collapse / insert range
  ext4: move unlocked dio protection from ext4_alloc_file_blocks()
  ext4: fix races between page faults and hole punching

1 files changed, 4 insertions, 6 deletions

diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index d884989cc83d..dfe3b9bafc0d 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -995,12 +995,11 @@ void ext4_show_inline_dir(struct inode *dir, struct buffer_head *bh,
  */
 static int ext4_add_dirent_to_inline(handle_t *handle,
                                      struct ext4_filename *fname,
-                                     struct dentry *dentry,
+                                     struct inode *dir,
                                      struct inode *inode,
                                      struct ext4_iloc *iloc,
                                      void *inline_start, int inline_size)
 {
-        struct inode    *dir = d_inode(dentry->d_parent);
         int             err;
         struct ext4_dir_entry_2 *de;
 
@@ -1245,12 +1244,11 @@ out:
  * the new created block.
  */
 int ext4_try_add_inline_entry(handle_t *handle, struct ext4_filename *fname,
-                              struct dentry *dentry, struct inode *inode)
+                              struct inode *dir, struct inode *inode)
 {
         int ret, inline_size;
         void *inline_start;
         struct ext4_iloc iloc;
-        struct inode *dir = d_inode(dentry->d_parent);
 
         ret = ext4_get_inode_loc(dir, &iloc);
         if (ret)
@@ -1264,7 +1262,7 @@ int ext4_try_add_inline_entry(handle_t *handle, struct ext4_filename *fname,
                                                  EXT4_INLINE_DOTDOT_SIZE;
         inline_size = EXT4_MIN_INLINE_DATA_SIZE - EXT4_INLINE_DOTDOT_SIZE;
 
-        ret = ext4_add_dirent_to_inline(handle, fname, dentry, inode, &iloc,
+        ret = ext4_add_dirent_to_inline(handle, fname, dir, inode, &iloc,
                                         inline_start, inline_size);
         if (ret != -ENOSPC)
                 goto out;
@@ -1285,7 +1283,7 @@ int ext4_try_add_inline_entry(handle_t *handle, struct ext4_filename *fname,
         if (inline_size) {
                 inline_start = ext4_get_inline_xattr_pos(dir, &iloc);
 
-                ret = ext4_add_dirent_to_inline(handle, fname, dentry,
+                ret = ext4_add_dirent_to_inline(handle, fname, dir,
                                                 inode, &iloc, inline_start,
                                                 inline_size);