From 7e341174bc3d3bb95ee034e18a352830aab93f91 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 18 Apr 2009 13:59:41 -0400 Subject: [PATCH] --- yaml --- r: 147821 b: refs/heads/master c: 79ed0226198c628133530b179a90dbf42b1c2eba h: refs/heads/master i: 147819: a83b543da2ba966fc17fc672ded43db13b12c1ab v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 1b79e24052f5..d3d752cf11bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9393bd07cf218ca51d0e627653f906a9d76a9131 +refs/heads/master: 79ed0226198c628133530b179a90dbf42b1c2eba diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 4d49a3eee6d4..c006bc61d1ea 100644 --- a/trunk/fs/namei.c +++ b/trunk/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); } /*