diff --git a/[refs] b/[refs] index 66d0e021bc76..bc644eafc3f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f020bc468fe4a91d32046d448511978c7b611315 +refs/heads/master: 62dfb5541a025b47df9405ff0219c7829a97d83b diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index fd0e067952ab..03e64fe4a14a 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -189,21 +189,18 @@ void release_task(struct task_struct * p) int session_of_pgrp(int pgrp) { struct task_struct *p; - int sid = -1; + int sid = 0; read_lock(&tasklist_lock); - do_each_task_pid(pgrp, PIDTYPE_PGID, p) { - if (process_session(p) > 0) { - sid = process_session(p); - goto out; - } - } while_each_task_pid(pgrp, PIDTYPE_PGID, p); - p = find_task_by_pid(pgrp); - if (p) + + p = find_task_by_pid_type(PIDTYPE_PGID, pgrp); + if (p == NULL) + p = find_task_by_pid(pgrp); + if (p != NULL) sid = process_session(p); -out: + read_unlock(&tasklist_lock); - + return sid; }