summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-03-20 18:12:37 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-03-20 19:16:01 -0400
commitd5a3f0eac7cd28ad28fb5239b0dca14c7ba11eeb (patch)
tree38bdc4f0021f0bbdfb96068e9c84d633e1607601 /src
parentc66a2e0cf9e548349acbb59ff03d63095cefe229 (diff)
core: remove unnecessary goto in setup_namespace
Diffstat (limited to 'src')
-rw-r--r--src/core/namespace.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 972380abc0..7e33d84156 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -218,16 +218,14 @@ int setup_namespace(char** read_write_dirs,
if (!mount_flags)
mount_flags = MS_SHARED;
- if (unshare(CLONE_NEWNS) < 0) {
- r = -errno;
- goto fail;
- }
+ if (unshare(CLONE_NEWNS) < 0)
+ return -errno;
m = mounts = (BindMount *) alloca(n * sizeof(BindMount));
if ((r = append_mounts(&m, read_write_dirs, READWRITE)) < 0 ||
(r = append_mounts(&m, read_only_dirs, READONLY)) < 0 ||
(r = append_mounts(&m, inaccessible_dirs, INACCESSIBLE)) < 0)
- goto fail;
+ return r;
if (private_tmp) {
m->path = "/tmp";
@@ -246,10 +244,8 @@ int setup_namespace(char** read_write_dirs,
/* Remount / as SLAVE so that nothing now mounted in the namespace
shows up in the parent */
- if (mount(NULL, "/", NULL, MS_SLAVE|MS_REC, NULL) < 0) {
- r = -errno;
- goto fail;
- }
+ if (mount(NULL, "/", NULL, MS_SLAVE|MS_REC, NULL) < 0)
+ return -errno;
for (m = mounts; m < mounts + n; ++m) {
r = apply_mount(m, tmp_dir, var_tmp_dir);
@@ -277,6 +273,5 @@ undo_mounts:
umount2(m->path, MNT_DETACH);
}
-fail:
return r;
}