Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos

1 files changed, 3 insertions, 2 deletions

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 5e7a38fa6ee6..768087bedbac 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1334,7 +1334,8 @@ int
 xfs_create_tmpfile(
         struct xfs_inode        *dp,
         struct dentry           *dentry,
-        umode_t                 mode)
+        umode_t                 mode,
+        struct xfs_inode        **ipp)
 {
         struct xfs_mount        *mp = dp->i_mount;
         struct xfs_inode        *ip = NULL;
@@ -1402,7 +1403,6 @@ xfs_create_tmpfile(
         xfs_qm_vop_create_dqattach(tp, ip, udqp, gdqp, pdqp);
 
         ip->i_d.di_nlink--;
-        d_tmpfile(dentry, VFS_I(ip));
         error = xfs_iunlink(tp, ip);
         if (error)
                 goto out_trans_abort;
@@ -1415,6 +1415,7 @@ xfs_create_tmpfile(
         xfs_qm_dqrele(gdqp);
         xfs_qm_dqrele(pdqp);
 
+        *ipp = ip;
         return 0;
 
  out_trans_abort: