diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-22 12:44:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-22 12:44:20 +0200 |
| commit | 3568b71d46bea87da1936902b6fbb2a3b1154b3d (patch) | |
| tree | 621ba4ccef15b87ce16f0fc2cc1e9b2a3f565ffc /fs/namespace.c | |
| parent | 2a3313f494c2f3f74a27d66f0f14b38558b7dba2 (diff) | |
| parent | 091069740304c979f957ceacec39c461d0192158 (diff) | |
Merge commit 'v2.6.30-rc3' into x86/urgent
Merge reason: hpet.c changed upstream, make sure we test against that
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index d9138f81ec1..41196209a90 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1377,7 +1377,7 @@ static int attach_recursive_mnt(struct vfsmount *source_mnt, if (parent_path) { detach_mnt(source_mnt, parent_path); attach_mnt(source_mnt, path); - touch_mnt_namespace(current->nsproxy->mnt_ns); + touch_mnt_namespace(parent_path->mnt->mnt_ns); } else { mnt_set_mountpoint(dest_mnt, dest_dentry, source_mnt); commit_tree(source_mnt); |