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

Commit 69cccb88 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Linus Torvalds
Browse files

Use task_pid_nr() instead of pid_nr(task_pid()) 



There are two places that do so - the cgroups subsystem and the autofs
code.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Cc: Ian Kent <raven@themaw.net>
Cc: Paul Menage <menage@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6651fd56

fs/autofs/root.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -214,7 +214,7 @@ static struct dentry *autofs_root_lookup(struct inode *dir, struct dentry *dentr 




	oz_mode = autofs_oz_mode(sbi);

	oz_mode = autofs_oz_mode(sbi);

	DPRINTK(("autofs_lookup: pid = %u, pgrp = %u, catatonic = %d, "

	DPRINTK(("autofs_lookup: pid = %u, pgrp = %u, catatonic = %d, "

				"oz_mode = %d\n", pid_nr(task_pid(current)),

				"oz_mode = %d\n", task_pid_nr(current),

				task_pgrp_nr(current), sbi->catatonic,

				task_pgrp_nr(current), sbi->catatonic,

				oz_mode));

				oz_mode));

kernel/cgroup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1763,7 +1763,7 @@ static int pid_array_load(pid_t *pidarray, int npids, struct cgroup *cont) 
	while ((tsk = cgroup_iter_next(cont, &it))) {

	while ((tsk = cgroup_iter_next(cont, &it))) {

		if (unlikely(n == npids))

		if (unlikely(n == npids))

			break;

			break;

		pidarray[n++] = pid_nr(task_pid(tsk));

		pidarray[n++] = task_pid_nr(tsk);

	}

	}

	cgroup_iter_end(cont, &it);

	cgroup_iter_end(cont, &it);

	return n;

	return n;