---

yaml --- r: 280207 b: refs/heads/master c: 3a2393d h: refs/heads/master i: 280205: 20837dc 280203: b1f4610 280199: cad324c 280191: 5f8a72d v: v3
git-mirror · Jan 4, 2012 · 3e32037 · 3e32037
1 parent 55b0a4a
commit 3e32037
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 909b0a88ef2dc86bd5d2223edf48eb30c865cb69
+refs/heads/master: 3a2393d71d77b034669d495b49c212a87e04abdc
diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c
@@ -572,8 +572,9 @@ static void detach_mnt(struct mount *mnt, struct path *old_path)
 void mnt_set_mountpoint(struct mount *mnt, struct dentry *dentry,
 			struct mount *child_mnt)
 {
-	child_mnt->mnt_parent = real_mount(mntget(&mnt->mnt));
+	mnt_add_count(mnt, 1);	/* essentially, that's mntget */
 	child_mnt->mnt_mountpoint = dget(dentry);
+	child_mnt->mnt_parent = mnt;
 	spin_lock(&dentry->d_lock);
 	dentry->d_flags |= DCACHE_MOUNTED;
 	spin_unlock(&dentry->d_lock);