diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-04-18 13:59:41 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-11 21:36:01 -0400 |
commit | 79ed0226198c628133530b179a90dbf42b1c2eba (patch) | |
tree | 7c6efb33209cc075257d3c1f5aa938b5f2d2feae | |
parent | 9393bd07cf218ca51d0e627653f906a9d76a9131 (diff) | |
download | linux-3.10-79ed0226198c628133530b179a90dbf42b1c2eba.tar.gz linux-3.10-79ed0226198c628133530b179a90dbf42b1c2eba.tar.bz2 linux-3.10-79ed0226198c628133530b179a90dbf42b1c2eba.zip |
switch follow_mount()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/namei.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/namei.c b/fs/namei.c index 4d49a3eee6d..c006bc61d1e 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -715,16 +715,16 @@ static int __follow_mount(struct path *path) return res; } -static void follow_mount(struct vfsmount **mnt, struct dentry **dentry) +static void follow_mount(struct path *path) { - while (d_mountpoint(*dentry)) { - struct vfsmount *mounted = lookup_mnt(*mnt, *dentry); + while (d_mountpoint(path->dentry)) { + struct vfsmount *mounted = lookup_mnt(path->mnt, path->dentry); if (!mounted) break; - dput(*dentry); - mntput(*mnt); - *mnt = mounted; - *dentry = dget(mounted->mnt_root); + dput(path->dentry); + mntput(path->mnt); + path->mnt = mounted; + path->dentry = dget(mounted->mnt_root); } } @@ -779,7 +779,7 @@ static __always_inline void follow_dotdot(struct nameidata *nd) mntput(nd->path.mnt); nd->path.mnt = parent; } - follow_mount(&nd->path.mnt, &nd->path.dentry); + follow_mount(&nd->path); } /* |