* [PATCH 1/1] don't swap 0 sids if ctx->arg->pids
@ 2009-11-06 7:37 Serge E. Hallyn
[not found] ` <20091106073708.GA18978-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Serge E. Hallyn @ 2009-11-06 7:37 UTC (permalink / raw)
To: Oren Laadan; +Cc: Linux Containers
It breaks restart --pidns
Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
restart.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/restart.c b/restart.c
index 47d729a..f523adf 100644
--- a/restart.c
+++ b/restart.c
@@ -2039,12 +2039,13 @@ static int ckpt_adjust_pids(struct ckpt_ctx *ctx)
* NOTE: thanks to the construction of tasks_arr[], the first
* ctx->pid_nr entries in both arrays match (the same pids).
*/
- for (m = 0; m < ctx->pids_nr; m++) {
- if (ctx->tasks_arr[m].flags & TASK_ZERO_SID)
- ctx->copy_arr[m].vsid = coord_sid;
- if (ctx->tasks_arr[m].flags & TASK_ZERO_PGID)
- ctx->copy_arr[m].vpgid = coord_sid;
- }
+ if (!ctx->args->pids)
+ for (m = 0; m < ctx->pids_nr; m++) {
+ if (ctx->tasks_arr[m].flags & TASK_ZERO_SID)
+ ctx->copy_arr[m].vsid = coord_sid;
+ if (ctx->tasks_arr[m].flags & TASK_ZERO_PGID)
+ ctx->copy_arr[m].vpgid = coord_sid;
+ }
memcpy(ctx->pids_arr, ctx->copy_arr, len);
close(ctx->pipe_in);
--
1.6.1.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] don't swap 0 sids if ctx->arg->pids
[not found] ` <20091106073708.GA18978-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
@ 2009-11-06 18:23 ` Oren Laadan
0 siblings, 0 replies; 2+ messages in thread
From: Oren Laadan @ 2009-11-06 18:23 UTC (permalink / raw)
To: Serge E. Hallyn; +Cc: Linux Containers
pulled with a slight change: tests for !ctx->args->pidns instead
of ctx->args->pids.
Oren.
Serge E. Hallyn wrote:
> It breaks restart --pidns
>
> Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
> restart.c | 13 +++++++------
> 1 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/restart.c b/restart.c
> index 47d729a..f523adf 100644
> --- a/restart.c
> +++ b/restart.c
> @@ -2039,12 +2039,13 @@ static int ckpt_adjust_pids(struct ckpt_ctx *ctx)
> * NOTE: thanks to the construction of tasks_arr[], the first
> * ctx->pid_nr entries in both arrays match (the same pids).
> */
> - for (m = 0; m < ctx->pids_nr; m++) {
> - if (ctx->tasks_arr[m].flags & TASK_ZERO_SID)
> - ctx->copy_arr[m].vsid = coord_sid;
> - if (ctx->tasks_arr[m].flags & TASK_ZERO_PGID)
> - ctx->copy_arr[m].vpgid = coord_sid;
> - }
> + if (!ctx->args->pids)
> + for (m = 0; m < ctx->pids_nr; m++) {
> + if (ctx->tasks_arr[m].flags & TASK_ZERO_SID)
> + ctx->copy_arr[m].vsid = coord_sid;
> + if (ctx->tasks_arr[m].flags & TASK_ZERO_PGID)
> + ctx->copy_arr[m].vpgid = coord_sid;
> + }
>
> memcpy(ctx->pids_arr, ctx->copy_arr, len);
> close(ctx->pipe_in);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-11-06 18:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-06 7:37 [PATCH 1/1] don't swap 0 sids if ctx->arg->pids Serge E. Hallyn
[not found] ` <20091106073708.GA18978-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2009-11-06 18:23 ` Oren Laadan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.