Merge tag 'xfs-4.17-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[sfrench/cifs-2.6.git] / fs / xfs / xfs_iops.c

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index e0307fbff911e5d28dadf897a033aba1954e39b3..a3ed3c811dfa4c8291a3a079ee35b37c5e08f318 100644 (file)
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -177,7 +177,7 @@ xfs_generic_create(
        if (!tmpfile) {
                error = xfs_create(XFS_I(dir), &name, mode, rdev, &ip);
        } else {
-               error = xfs_create_tmpfile(XFS_I(dir), dentry, mode, &ip);
+               error = xfs_create_tmpfile(XFS_I(dir), mode, &ip);
        }
        if (unlikely(error))
                goto out_free_acl;
@@ -1285,7 +1285,10 @@ xfs_setup_iops(
        case S_IFREG:
                inode->i_op = &xfs_inode_operations;
                inode->i_fop = &xfs_file_operations;
-               inode->i_mapping->a_ops = &xfs_address_space_operations;
+               if (IS_DAX(inode))
+                       inode->i_mapping->a_ops = &xfs_dax_aops;
+               else
+                       inode->i_mapping->a_ops = &xfs_address_space_operations;
                break;
        case S_IFDIR:
                if (xfs_sb_version_hasasciici(&XFS_M(inode->i_sb)->m_sb))