From: "Serge E. Hallyn" <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
To: Oren Laadan <orenl-eQaUEPhvms7ENvBUuze7eA@public.gmane.org>
Cc: Linux Containers <containers-qjLDD68F18O7TbgM5vRIOg@public.gmane.org>
Subject: [PATCH 1/1] don't swap 0 sids if ctx->arg->pids
Date: Fri, 6 Nov 2009 01:37:08 -0600 [thread overview]
Message-ID: <20091106073708.GA18978@us.ibm.com> (raw)
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
next reply other threads:[~2009-11-06 7:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-06 7:37 Serge E. Hallyn [this message]
[not found] ` <20091106073708.GA18978-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2009-11-06 18:23 ` [PATCH 1/1] don't swap 0 sids if ctx->arg->pids Oren Laadan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091106073708.GA18978@us.ibm.com \
--to=serue-r/jw6+rmf7hqt0dzr+alfa@public.gmane.org \
--cc=containers-qjLDD68F18O7TbgM5vRIOg@public.gmane.org \
--cc=orenl-eQaUEPhvms7ENvBUuze7eA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.