Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md

Pull in pre-requisites for adding raid10 support to dm-raid.

1 files changed, 5 insertions, 2 deletions

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 3a05a41b5d76..1f1535d25a9b 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -208,6 +208,7 @@ xfs_open_by_handle(
         struct inode            *inode;
         struct dentry           *dentry;
         fmode_t                 fmode;
+        struct path             path;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -XFS_ERROR(EPERM);
@@ -252,8 +253,10 @@ xfs_open_by_handle(
                 goto out_dput;
         }
 
-        filp = dentry_open(dentry, mntget(parfilp->f_path.mnt),
-                           hreq->oflags, cred);
+        path.mnt = parfilp->f_path.mnt;
+        path.dentry = dentry;
+        filp = dentry_open(&path, hreq->oflags, cred);
+        dput(dentry);
         if (IS_ERR(filp)) {
                 put_unused_fd(fd);
                 return PTR_ERR(filp);