Re: [LTP] [PATCH v1] swapon04: Settle udev after mkswap to prevent tmpfs hole filling

[Cyril Hrubis <chrubis@suse.cz>]

Hi!
> diff --git a/testcases/kernel/syscalls/swapon/swapon04.c b/testcases/kernel/syscalls/swapon/swapon04.c
> index de95849e3..141456442 100644
> --- a/testcases/kernel/syscalls/swapon/swapon04.c
> +++ b/testcases/kernel/syscalls/swapon/swapon04.c
> @@ -138,6 +138,7 @@ static void verify_swapon(unsigned int n)
>  	struct stat st;
>  	blkcnt_t blocks_before, blocks_after;
>  	const char *const mkswap_argv[] = {"mkswap", loop_dev, NULL};
> +	const char *const udevadm_argv[] = {"udevadm", "settle", NULL};
>  
>  	tst_res(TINFO, "Testing swapon(%s, %s)", loop_dev, tc->desc);
>  
> @@ -148,6 +149,7 @@ static void verify_swapon(unsigned int n)
>  	SAFE_CLOSE(fd);
>  
>  	tst_cmd(mkswap_argv, "/dev/null", "/dev/null", 0);
> +	tst_cmd(udevadm_argv, "/dev/null", "/dev/null", TST_CMD_PASS_RETVAL);
>  
>  	SAFE_STAT(BACKING_FILE, &st);
>  	blocks_before = st.st_blocks;

The udevadm has to be added to .needs_cmds as well:

diff --git a/testcases/kernel/syscalls/swapon/swapon04.c b/testcases/kernel/syscalls/swapon/swapon04.c
index de95849e3..15a7c1063 100644
--- a/testcases/kernel/syscalls/swapon/swapon04.c
+++ b/testcases/kernel/syscalls/swapon/swapon04.c
@@ -195,6 +195,7 @@ static struct tst_test test = {
        },
        .needs_cmds = (struct tst_cmd[]) {
                {.cmd = "mkswap"},
+               {.cmd = "udevadm"},
                {}
        },
        .needs_kconfigs = (const char *[]) {


-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp