Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cc1b22a authored by Cedric Le Goater's avatar Cedric Le Goater Committed by Linus Torvalds
Browse files

[PATCH] use current->nsproxy->pid_ns 



Signed-off-by: default avatarCedric Le Goater <clg@fr.ibm.com>
Cc: Kirill Korotaev <dev@openvz.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9a575a92

fs/proc/proc_misc.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int loadavg_read_proc(char *page, char **start, off_t off, 
		LOAD_INT(a), LOAD_FRAC(a),

		LOAD_INT(b), LOAD_FRAC(b),

		LOAD_INT(c), LOAD_FRAC(c),

		nr_running(), nr_threads, init_pid_ns.last_pid);

		nr_running(), nr_threads, current->nsproxy->pid_ns->last_pid);

	return proc_calc_metrics(page, start, off, count, eof, len);

}

kernel/pid.c

+3 −3
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ fastcall void free_pid(struct pid *pid) 
	hlist_del_rcu(&pid->pid_chain);

	spin_unlock_irqrestore(&pidmap_lock, flags);



	free_pidmap(&init_pid_ns, pid->nr);

	free_pidmap(current->nsproxy->pid_ns, pid->nr);

	call_rcu(&pid->rcu, delayed_put_pid);

}
@@ -210,7 +210,7 @@ struct pid *alloc_pid(void) 
	if (!pid)

		goto out;



	nr = alloc_pidmap(&init_pid_ns);

	nr = alloc_pidmap(current->nsproxy->pid_ns);

	if (nr < 0)

		goto out_free;
@@ -352,7 +352,7 @@ struct pid *find_ge_pid(int nr) 
		pid = find_pid(nr);

		if (pid)

			break;

		nr = next_pidmap(&init_pid_ns, nr);

		nr = next_pidmap(current->nsproxy->pid_ns, nr);

	} while (nr > 0);



	return pid;