diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2010-03-02 17:51:53 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-19 08:59:09 -0500 |
commit | 17cf22c33e1f1b5e435469c84e43872579497653 (patch) | |
tree | c5cec307c06f7e4ddc26e04e73c8833897b67113 /fs | |
parent | 49f4d8b93ccf9454284b6f524b96c66d8d7fbccc (diff) |
pidns: Use task_active_pid_ns where appropriate
The expressions tsk->nsproxy->pid_ns and task_active_pid_ns
aka ns_of_pid(task_pid(tsk)) should have the same number of
cache line misses with the practical difference that
ns_of_pid(task_pid(tsk)) is released later in a processes life.
Furthermore by using task_active_pid_ns it becomes trivial
to write an unshare implementation for the the pid namespace.
So I have used task_active_pid_ns everywhere I can.
In fork since the pid has not yet been attached to the
process I use ns_of_pid, to achieve the same effect.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/hppfs/hppfs.c | 2 | ||||
-rw-r--r-- | fs/proc/root.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c index 78f21f8dc2ec..43b315f2002b 100644 --- a/fs/hppfs/hppfs.c +++ b/fs/hppfs/hppfs.c | |||
@@ -710,7 +710,7 @@ static int hppfs_fill_super(struct super_block *sb, void *d, int silent) | |||
710 | struct vfsmount *proc_mnt; | 710 | struct vfsmount *proc_mnt; |
711 | int err = -ENOENT; | 711 | int err = -ENOENT; |
712 | 712 | ||
713 | proc_mnt = mntget(current->nsproxy->pid_ns->proc_mnt); | 713 | proc_mnt = mntget(task_active_pid_ns(current)->proc_mnt); |
714 | if (IS_ERR(proc_mnt)) | 714 | if (IS_ERR(proc_mnt)) |
715 | goto out; | 715 | goto out; |
716 | 716 | ||
diff --git a/fs/proc/root.c b/fs/proc/root.c index 13ef6247e7a3..fc1609321a78 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
@@ -106,7 +106,7 @@ static struct dentry *proc_mount(struct file_system_type *fs_type, | |||
106 | ns = (struct pid_namespace *)data; | 106 | ns = (struct pid_namespace *)data; |
107 | options = NULL; | 107 | options = NULL; |
108 | } else { | 108 | } else { |
109 | ns = current->nsproxy->pid_ns; | 109 | ns = task_active_pid_ns(current); |
110 | options = data; | 110 | options = data; |
111 | } | 111 | } |
112 | 112 | ||