From 3e3203781ce7268b78d22c24c8deb828ae016e3a Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 25 Nov 2011 03:19:09 -0500 Subject: [PATCH] --- yaml --- r: 280207 b: refs/heads/master c: 3a2393d71d77b034669d495b49c212a87e04abdc h: refs/heads/master i: 280205: 20837dc349a0fc03bd754513ed2b4ba263e8763f 280203: b1f46105222b7120ea4adb46d5a3ee1627098cf1 280199: cad324c9b613547029569de1e693b8b2a7f54037 280191: 5f8a72d3fd4dafdc1884c4c89315c5531eac64fb v: v3 --- [refs] | 2 +- trunk/fs/namespace.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 176286dc12a4..05ba24c6d81a 100644 --- 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 index 24e845671ad3..cd6389387d1f 100644 --- 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);