[LTP] [PATCH] fanotify06: create a mount for test

[Jan Kara]

On Wed 29-06-16 10:49:11, Jan Stancek wrote:
> This testcase can rarely fail, when there is a background process
> modifying files on same mountpoint as is LTP's tmpdir:
> 
> fanotify06    1  TFAIL  :  fanotify06.c:212: group 0 got more than one event (48 > 24)
> fanotify06    2  TFAIL  :  fanotify06.c:212: group 1 got more than one event (48 > 24)
> fanotify06    3  TFAIL  :  fanotify06.c:212: group 2 got more than one event (48 > 24)
> fanotify06    4  TFAIL  :  fanotify06.c:222: group 3 got event
> fanotify06    5  TFAIL  :  fanotify06.c:222: group 4 got event
> fanotify06    6  TPASS  :  group 5 got no event
> fanotify06    7  TPASS  :  group 6 got no event
> fanotify06    8  TPASS  :  group 7 got no event
> fanotify06    9  TPASS  :  group 8 got no event
> 
> This patch creates a mount, which should be only used by this
> test to limit interference from rest of OS. It also adds missing
> tst_require_root().
> 
> Signed-off-by: Jan Stancek <jstancek@redhat.com>

Yeah, that is a good idea. The patch looks good to me so feel free to add:

Acked-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  testcases/kernel/syscalls/fanotify/fanotify06.c | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c
> index 93c960268b57..cdbc7a16c0d7 100644
> --- a/testcases/kernel/syscalls/fanotify/fanotify06.c
> +++ b/testcases/kernel/syscalls/fanotify/fanotify06.c
> @@ -42,6 +42,7 @@
>  #include <sys/fcntl.h>
>  #include <errno.h>
>  #include <string.h>
> +#include <sys/mount.h>
>  #include <sys/syscall.h>
>  #include "test.h"
>  #include "linux_syscall_numbers.h"
> @@ -80,6 +81,9 @@ static int fd_notify[FANOTIFY_PRIORITIES][GROUPS_PER_PRIO];
>  
>  static char event_buf[EVENT_BUF_LEN];
>  
> +#define MOUNT_NAME "mntpoint"
> +static int mount_created;
> +
>  static void create_fanotify_groups(void)
>  {
>  	unsigned int p, i;
> @@ -245,8 +249,15 @@ static void setup(void)
>  
>  	TEST_PAUSE;
>  
> +	tst_require_root();
>  	tst_tmpdir();
>  
> +	SAFE_MKDIR(cleanup, MOUNT_NAME, 0755);
> +	if (mount(MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL) < 0)
> +		tst_brkm(TBROK | TERRNO, cleanup, "bind mount failed");
> +	mount_created = 1;
> +	SAFE_CHDIR(cleanup, MOUNT_NAME);
> +
>  	sprintf(fname, "tfile_%d", getpid());
>  	fd = SAFE_OPEN(cleanup, fname, O_RDWR | O_CREAT, 0700);
>  	SAFE_WRITE(cleanup, 1, fd, fname, 1);
> @@ -258,6 +269,13 @@ static void setup(void)
>  static void cleanup(void)
>  {
>  	cleanup_fanotify_groups();
> +
> +	if (chdir(tst_get_tmpdir()) < 0)
> +		tst_brkm(TBROK, NULL, "chdir(tmpdir) failed");
> +
> +	if (mount_created && tst_umount(MOUNT_NAME) < 0)
> +		tst_brkm(TBROK | TERRNO, NULL, "umount failed");
> +
>  	tst_rmdir();
>  }
>  
> -- 
> 1.8.3.1
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR