---

yaml --- r: 197971 b: refs/heads/master c: 9a22968 h: refs/heads/master i: 197969: 9ad9e85 197967: 031ad00 v: v3
git-mirror · May 21, 2010 · bd1b12d · bd1b12d
1 parent 82a13c0
commit bd1b12d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;
 }