shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-04 21:47:31 +03:00
Code

core: remove unnecessary goto in setup_namespace

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-03-20 18:12:37 -04:00
parent c66a2e0cf9
commit d5a3f0eac7
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/namespace.c
View File

@ -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;
}