diff options
Diffstat (limited to 'testcases/kernel/containers/mountns/mountns03.c')
| -rw-r--r-- | testcases/kernel/containers/mountns/mountns03.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/testcases/kernel/containers/mountns/mountns03.c b/testcases/kernel/containers/mountns/mountns03.c index 1d26a25d8..6066d1c54 100644 --- a/testcases/kernel/containers/mountns/mountns03.c +++ b/testcases/kernel/containers/mountns/mountns03.c @@ -36,8 +36,9 @@ #include <sys/mount.h> #include "mountns.h" #include "tst_test.h" +#include "lapi/sched.h" -static int child_func(LTP_ATTRIBUTE_UNUSED void *arg) +static void child_func(void) { /* * makes mount DIRA a slave of DIRA (all slave mounts have @@ -59,13 +60,14 @@ static int child_func(LTP_ATTRIBUTE_UNUSED void *arg) TST_CHECKPOINT_WAKE_AND_WAIT(0); SAFE_UMOUNT(DIRA); - - return 0; } static void run(void) { - int ret; + const struct tst_clone_args args = { + .flags = CLONE_NEWNS, + .exit_signal = SIGCHLD, + }; SAFE_UNSHARE(CLONE_NEWNS); @@ -76,9 +78,10 @@ static void run(void) SAFE_MOUNT("none", DIRA, "none", MS_SHARED, NULL); - ret = ltp_clone_quick(CLONE_NEWNS | SIGCHLD, child_func, NULL); - if (ret < 0) - tst_brk(TBROK, "clone failed"); + if (!SAFE_CLONE(&args)) { + child_func(); + return; + } TST_CHECKPOINT_WAIT(0); @@ -104,7 +107,6 @@ static void run(void) static void setup(void) { - check_newns(); create_folders(); } @@ -118,5 +120,10 @@ static struct tst_test test = { .cleanup = cleanup, .test_all = run, .needs_root = 1, + .forks_child = 1, .needs_checkpoints = 1, + .needs_kconfigs = (const char *[]) { + "CONFIG_USER_NS", + NULL, + }, }; |