Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 147821
b: refs/heads/master
c: 79ed022
h: refs/heads/master
i:
  147819: a83b543
v: v3
  • Loading branch information
Al Viro committed Jun 12, 2009
1 parent 765481e commit 7e34117
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9393bd07cf218ca51d0e627653f906a9d76a9131
refs/heads/master: 79ed0226198c628133530b179a90dbf42b1c2eba
16 changes: 8 additions & 8 deletions trunk/fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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);
}

/*
Expand Down

0 comments on commit 7e34117

Please sign in to comment.