diff --git a/[refs] b/[refs] index 9633e0230f31..1f963afde518 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51ee049e771c14a29aaee8ecd6cbbe14db088f3a +refs/heads/master: 9a2296832c43da93a88e1edd59f3d17acffca36c diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index b86b96fe1dc3..48e1f60520ea 100644 --- a/trunk/fs/namei.c +++ b/trunk/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; }