From: Amir Goldstein <amir73il@gmail.com>
To: Christian Brauner <brauner@kernel.org>
Cc: Jan Kara <jack@suse.cz>, John Hubbard <jhubbard@nvidia.com>,
Miklos Szeredi <miklos@szeredi.hu>,
linux-fsdevel@vger.kernel.org
Subject: [PATCH v2 1/8] selftests/filesystems: move wrapper.h out of overlayfs subdir
Date: Fri, 9 May 2025 15:32:33 +0200 [thread overview]
Message-ID: <20250509133240.529330-2-amir73il@gmail.com> (raw)
In-Reply-To: <20250509133240.529330-1-amir73il@gmail.com>
This is not an overlayfs specific header.
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
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%)
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
--
2.34.1
next prev parent reply other threads:[~2025-05-09 13:32 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-09 13:32 [PATCH v2 0/8] filesystems selftests cleanups and fanotify test Amir Goldstein
2025-05-09 13:32 ` Amir Goldstein [this message]
2025-05-12 9:28 ` [PATCH v2 1/8] selftests/filesystems: move wrapper.h out of overlayfs subdir Christian Brauner
2025-05-09 13:32 ` [PATCH v2 2/8] selftests/fs/statmount: build with tools include dir Amir Goldstein
2025-05-12 9:29 ` Christian Brauner
2025-05-09 13:32 ` [PATCH v2 3/8] selftests/pidfd: move syscall definitions into wrappers.h Amir Goldstein
2025-05-12 9:29 ` Christian Brauner
2025-05-09 13:32 ` [PATCH v2 4/8] selftests/mount_settattr: remove duplicate syscall definitions Amir Goldstein
2025-05-12 9:30 ` Christian Brauner
2025-05-09 13:32 ` [PATCH v2 5/8] selftests/fs/mount-notify: build with tools include dir Amir Goldstein
2025-05-12 9:31 ` Christian Brauner
2025-05-09 13:32 ` [PATCH v2 6/8] selftests/filesystems: create get_unique_mnt_id() helper Amir Goldstein
2025-05-12 9:31 ` Christian Brauner
2025-05-09 13:32 ` [PATCH v2 7/8] selftests/filesystems: create setup_userns() helper Amir Goldstein
2025-05-12 9:37 ` Christian Brauner
2025-05-09 13:32 ` [PATCH v2 8/8] selftests/fs/mount-notify: add a test variant running inside userns Amir Goldstein
2025-05-12 9:33 ` Christian Brauner
2025-05-12 9:35 ` [PATCH v2 0/8] filesystems selftests cleanups and fanotify test Christian Brauner
2025-05-12 9:40 ` Christian Brauner
2025-05-14 8:25 ` Amir Goldstein
2025-05-15 9:13 ` Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250509133240.529330-2-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=brauner@kernel.org \
--cc=jack@suse.cz \
--cc=jhubbard@nvidia.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=miklos@szeredi.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).