From c7a750d95f87a0f07b98cf154a2bff87baa18652 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 6 Jun 2005 13:36:01 -0700 Subject: [PATCH] --- yaml --- r: 1843 b: refs/heads/master c: d73ffe16b8baafae6e9249acee6b50c24099c6de h: refs/heads/master i: 1841: eb1874a4bbb185e4cd812402663c09beee0d52ec 1839: 4655176f3af5f8a4a5db49d384940a86605912d4 v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ea5daafb2ee2..d142fd9d0737 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e7506e4dd9e40c189fcbec95d5dbc92f2e5926a +refs/heads/master: d73ffe16b8baafae6e9249acee6b50c24099c6de diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 167f19b5e51a..e42f7c35545a 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -1442,6 +1442,7 @@ int open_namei(const char * pathname, int flag, int mode, struct nameidata *nd) nd->flags &= ~LOOKUP_PARENT; down(&dir->d_inode->i_sem); path.dentry = __lookup_hash(&nd->last, nd->dentry, nd); + path.mnt = nd->mnt; do_last: error = PTR_ERR(path.dentry); @@ -1479,7 +1480,8 @@ int open_namei(const char * pathname, int flag, int mode, struct nameidata *nd) error = -ELOOP; if (flag & O_NOFOLLOW) goto exit_dput; - while (__follow_down(&nd->mnt,&path.dentry) && d_mountpoint(path.dentry)); + while (__follow_down(&path.mnt,&path.dentry) && d_mountpoint(path.dentry)); + nd->mnt = path.mnt; } error = -ENOENT; if (!path.dentry->d_inode) @@ -1524,6 +1526,7 @@ int open_namei(const char * pathname, int flag, int mode, struct nameidata *nd) goto exit_dput; error = __do_follow_link(path.dentry, nd); dput(path.dentry); + path.mnt = nd->mnt; if (error) return error; nd->flags &= ~LOOKUP_PARENT;