Re: [PATCH 1/5] selftests/filesystems: move wrapper.h out of overlayfs subdir

[John Hubbard <jhubbard@xxxxxxxxxx>]

On 5/7/25 1:42 PM, Amir Goldstein wrote:
> This is not an overlayfs specific header.
>
> Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
> ---
>   tools/testing/selftests/filesystems/overlayfs/Makefile          | 2 +-
>   tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c     | 2 +-
>   .../selftests/filesystems/overlayfs/set_layers_via_fds.c        | 2 +-
>   tools/testing/selftests/filesystems/{overlayfs => }/wrappers.h  | 0
>   tools/testing/selftests/mount_setattr/Makefile                  | 2 ++
>   tools/testing/selftests/mount_setattr/mount_setattr_test.c      | 2 +-
>   6 files changed, 6 insertions(+), 4 deletions(-)
>   rename tools/testing/selftests/filesystems/{overlayfs => }/wrappers.h (100%)

Simple and clearly correct by inspection, yes.

Reviewed-by: John Hubbard <jhubbard@xxxxxxxxxx>

thanks,
--
John Hubbard

> diff --git a/tools/testing/selftests/filesystems/overlayfs/Makefile b/tools/testing/selftests/filesystems/overlayfs/Makefile
> index 6c661232b3b5..d3ad4a77db9b 100644
> --- a/tools/testing/selftests/filesystems/overlayfs/Makefile
> +++ b/tools/testing/selftests/filesystems/overlayfs/Makefile
> @@ -4,7 +4,7 @@ CFLAGS += -Wall
>   CFLAGS += $(KHDR_INCLUDES)
>   LDLIBS += -lcap
>   
> -LOCAL_HDRS += wrappers.h log.h
> +LOCAL_HDRS += ../wrappers.h log.h
>   
>   TEST_GEN_PROGS := dev_in_maps
>   TEST_GEN_PROGS += set_layers_via_fds
> diff --git a/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c b/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c
> index 3b796264223f..31db54b00e64 100644
> --- a/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c
> +++ b/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c
> @@ -17,7 +17,7 @@
>   
>   #include "../../kselftest.h"
>   #include "log.h"
> -#include "wrappers.h"
> +#include "../wrappers.h"
>   
>   static long get_file_dev_and_inode(void *addr, struct statx *stx)
>   {
> diff --git a/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c b/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c
> index 5074e64e74a8..dc0449fa628f 100644
> --- a/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c
> +++ b/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c
> @@ -16,7 +16,7 @@
>   #include "../../pidfd/pidfd.h"
>   #include "log.h"
>   #include "../utils.h"
> -#include "wrappers.h"
> +#include "../wrappers.h"
>   
>   FIXTURE(set_layers_via_fds) {
>   	int pidfd;
> diff --git a/tools/testing/selftests/filesystems/overlayfs/wrappers.h b/tools/testing/selftests/filesystems/wrappers.h
> similarity index 100%
> rename from tools/testing/selftests/filesystems/overlayfs/wrappers.h
> rename to tools/testing/selftests/filesystems/wrappers.h
> diff --git a/tools/testing/selftests/mount_setattr/Makefile b/tools/testing/selftests/mount_setattr/Makefile
> index 0c0d7b1234c1..4d4f810cdf2c 100644
> --- a/tools/testing/selftests/mount_setattr/Makefile
> +++ b/tools/testing/selftests/mount_setattr/Makefile
> @@ -2,6 +2,8 @@
>   # Makefile for mount selftests.
>   CFLAGS = -g $(KHDR_INCLUDES) -Wall -O2 -pthread
>   
> +LOCAL_HDRS += ../filesystems/wrappers.h
> +
>   TEST_GEN_PROGS := mount_setattr_test
>   
>   include ../lib.mk
> diff --git a/tools/testing/selftests/mount_setattr/mount_setattr_test.c b/tools/testing/selftests/mount_setattr/mount_setattr_test.c
> index 432d9af23ab2..9e933925b3c2 100644
> --- a/tools/testing/selftests/mount_setattr/mount_setattr_test.c
> +++ b/tools/testing/selftests/mount_setattr/mount_setattr_test.c
> @@ -20,7 +20,7 @@
>   #include <stdarg.h>
>   #include <linux/mount.h>
>   
> -#include "../filesystems/overlayfs/wrappers.h"
> +#include "../filesystems/wrappers.h"
>   #include "../kselftest_harness.h"
>   
>   #ifndef CLONE_NEWNS