Commit 91ea3b92 authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

namespace: return -1 if one of ns can't be initilized

[xemul: Added explicit braces into ifs]
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 4c88cafe
...@@ -151,8 +151,6 @@ int dump_namespaces(struct pid *ns_pid, unsigned int ns_flags) ...@@ -151,8 +151,6 @@ int dump_namespaces(struct pid *ns_pid, unsigned int ns_flags)
int prepare_namespace(int pid, unsigned long clone_flags) int prepare_namespace(int pid, unsigned long clone_flags)
{ {
int ret = 0;
pr_info("Restoring namespaces %d flags 0x%lx\n", pr_info("Restoring namespaces %d flags 0x%lx\n",
pid, clone_flags); pid, clone_flags);
...@@ -162,16 +160,16 @@ int prepare_namespace(int pid, unsigned long clone_flags) ...@@ -162,16 +160,16 @@ int prepare_namespace(int pid, unsigned long clone_flags)
* tree (i.e. -- mnt_ns restoring) * tree (i.e. -- mnt_ns restoring)
*/ */
if (clone_flags & CLONE_NEWNET) if ((clone_flags & CLONE_NEWNET) && prepare_net_ns(pid))
ret = prepare_net_ns(pid); return -1;
if (clone_flags & CLONE_NEWUTS) if ((clone_flags & CLONE_NEWUTS) && prepare_utsns(pid))
ret = prepare_utsns(pid); return -1;
if (clone_flags & CLONE_NEWIPC) if ((clone_flags & CLONE_NEWIPC) && prepare_ipc_ns(pid))
ret = prepare_ipc_ns(pid); return -1;
if (clone_flags & CLONE_NEWNS) if ((clone_flags & CLONE_NEWNS) && prepare_mnt_ns(pid))
ret = prepare_mnt_ns(pid); return -1;
return ret; return 0;
} }
int try_show_namespaces(int ns_pid, struct cr_options *o) int try_show_namespaces(int ns_pid, struct cr_options *o)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment