From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Serge E. Hallyn" Subject: [PATCH 1/1] restore_ipc_ns: set ret=0 if no error Date: Mon, 15 Jun 2009 15:59:11 -0500 Message-ID: <20090615205911.GA18820@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 Why pretend there's an error when there isn't? (Without this, all restarts fail with CONFIG_UTS_NS or CONFIG_IPC_NS on) Signed-off-by: Serge E. Hallyn --- kernel/nsproxy.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c index e3db0b9..5fae13c 100644 --- a/kernel/nsproxy.c +++ b/kernel/nsproxy.c @@ -308,6 +308,7 @@ static struct nsproxy *do_restore_ns(struct ckpt_ctx *ctx) nsproxy = create_nsproxy(); if (!nsproxy) goto out; + ret = 0; get_uts_ns(uts_ns); nsproxy->uts_ns = uts_ns; -- 1.6.1