From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Serge E. Hallyn" Subject: [PATCH 1/1] don't swap 0 sids if ctx->arg->pids Date: Fri, 6 Nov 2009 01:37:08 -0600 Message-ID: <20091106073708.GA18978@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Oren Laadan Cc: Linux Containers List-Id: containers.vger.kernel.org It breaks restart --pidns Signed-off-by: Serge E. Hallyn --- 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