summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorHuang Shijie <shijie8@gmail.com>2010-04-02 11:37:13 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2010-05-22 00:31:22 +0200
commit9a2296832c43da93a88e1edd59f3d17acffca36c (patch)
treee55b77c403c60291344d0961d2f0e4f2e9a2bb7f /fs
parentvfs: add lockdep annotation to s_vfs_rename_key for ecryptfs (diff)
downloadlinux-9a2296832c43da93a88e1edd59f3d17acffca36c.tar.xz
linux-9a2296832c43da93a88e1edd59f3d17acffca36c.zip
namei.c : update mnt when it needed
update the mnt of the path when it is not equal to the new one. Signed-off-by: Huang Shijie <shijie8@gmail.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/namei.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c
index b86b96fe1dc3..48e1f60520ea 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -523,9 +523,10 @@ static void path_put_conditional(struct path *path, struct nameidata *nd)
static inline void path_to_nameidata(struct path *path, struct nameidata *nd)
{
dput(nd->path.dentry);
- if (nd->path.mnt != path->mnt)
+ if (nd->path.mnt != path->mnt) {
mntput(nd->path.mnt);
- nd->path.mnt = path->mnt;
+ nd->path.mnt = path->mnt;
+ }
nd->path.dentry = path->dentry;
}