4 files changed, 11 insertions, 11 deletions

diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index f71dac9986f0..670407576b25 100644
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -212,7 +212,7 @@ static int find_autofs_mount(const char *pathname,
                                 err = 0;
                         }
                 }
-                if (!follow_up(&path.mnt, &path.dentry))
+                if (!follow_up(&path))
                         break;
         }
         path_put(&path);
diff --git a/fs/namei.c b/fs/namei.c
index 4379ef989709..8c1f48ae68e7 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -675,23 +675,23 @@ loop:
         return err;
 }
 
-int follow_up(struct vfsmount **mnt, struct dentry **dentry)
+int follow_up(struct path *path)
 {
         struct vfsmount *parent;
         struct dentry *mountpoint;
         spin_lock(&vfsmount_lock);
-        parent=(*mnt)->mnt_parent;
-        if (parent == *mnt) {
+        parent = path->mnt->mnt_parent;
+        if (parent == path->mnt) {
                 spin_unlock(&vfsmount_lock);
                 return 0;
         }
         mntget(parent);
-        mountpoint=dget((*mnt)->mnt_mountpoint);
+        mountpoint = dget(path->mnt->mnt_mountpoint);
         spin_unlock(&vfsmount_lock);
-        dput(*dentry);
-        *dentry = mountpoint;
-        mntput(*mnt);
-        *mnt = parent;
+        dput(path->dentry);
+        path->dentry = mountpoint;
+        mntput(path->mnt);
+        path->mnt = parent;
         return 1;
 }
 
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 9f1ea3127f5d..7b2b3f775326 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -173,7 +173,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,
                                             .dentry = dget(dparent)};
 
                         while (path.dentry == path.mnt->mnt_root &&
-                               follow_up(&path.mnt, &path.dentry))
+                               follow_up(&path))
                                 ;
                         dp = dget_parent(path.dentry);
                         dput(path.dentry);
diff --git a/include/linux/namei.h b/include/linux/namei.h
index 325dd3ad39a0..9cd5a717be3b 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -79,7 +79,7 @@ extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
 extern struct dentry *lookup_one_noperm(const char *, struct dentry *);
 
 extern int follow_down(struct vfsmount **, struct dentry **);
-extern int follow_up(struct vfsmount **, struct dentry **);
+extern int follow_up(struct path *);
 
 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
 extern void unlock_rename(struct dentry *, struct dentry *);