diff options
Diffstat (limited to 'kernel/pid_namespace.c')
| -rw-r--r-- | kernel/pid_namespace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c index c1c3dc1c6023..bea15bdf82b0 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c | |||
| @@ -181,6 +181,7 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns) | |||
| 181 | int nr; | 181 | int nr; |
| 182 | int rc; | 182 | int rc; |
| 183 | struct task_struct *task, *me = current; | 183 | struct task_struct *task, *me = current; |
| 184 | int init_pids = thread_group_leader(me) ? 1 : 2; | ||
| 184 | 185 | ||
| 185 | /* Don't allow any more processes into the pid namespace */ | 186 | /* Don't allow any more processes into the pid namespace */ |
| 186 | disable_pid_allocation(pid_ns); | 187 | disable_pid_allocation(pid_ns); |
| @@ -230,7 +231,7 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns) | |||
| 230 | */ | 231 | */ |
| 231 | for (;;) { | 232 | for (;;) { |
| 232 | set_current_state(TASK_UNINTERRUPTIBLE); | 233 | set_current_state(TASK_UNINTERRUPTIBLE); |
| 233 | if (pid_ns->nr_hashed == 1) | 234 | if (pid_ns->nr_hashed == init_pids) |
| 234 | break; | 235 | break; |
| 235 | schedule(); | 236 | schedule(); |
| 236 | } | 237 | } |
