Re: linux-next: build failure after merge of the vfs-brauner tree

[Christian Brauner <brauner@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 673 bytes --]

On Mon, Mar 23, 2026 at 01:56:59PM +0000, Mark Brown wrote:
> On Fri, Mar 13, 2026 at 01:00:43PM +0000, Mark Brown wrote:
> > Hi all,
> > 
> > After merging the vfs-brauner tree, today's linux-next build (arm64
> > kselftest) failed like this:
> > 
> >   CC       statmount_test_ns
> > statmount_test_ns.c:37:19: error: static declaration of 'wait_for_pid' follows non-static declaration
> >    37 | static inline int wait_for_pid(pid_t pid)
> >       |                   ^~~~~~~~~~~~
> 
> This issue is still present in today's -next, the version of the
> vfs-brauner tree being merged is currently that from next-20260312.

Sorry about this. Fixed now by appended patch.

[-- Attachment #2: 0001-selftests-statmount-remove-duplicate-wait_for_pid.patch --]
[-- Type: text/x-diff, Size: 1733 bytes --]

From 418d1c0cdd872493731cf1f10f16a54b38a9ef57 Mon Sep 17 00:00:00 2001
From: Christian Brauner <brauner@kernel.org>
Date: Mon, 23 Mar 2026 16:31:30 +0100
Subject: [PATCH] selftests/statmount: remove duplicate wait_for_pid()

Remove the local static wait_for_pid() definition from
statmount_test_ns.c as it conflicts with the extern declaration in
utils.h. The identical function is already provided by utils.c.

Fixes: 32f54f2bbccf (your "add tests for empty mount namespaces")
Cc: <stable@kernel.org> # mainline only
Signed-off-by: Christian Brauner <brauner@kernel.org>
---
 .../filesystems/statmount/statmount_test_ns.c | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/tools/testing/selftests/filesystems/statmount/statmount_test_ns.c b/tools/testing/selftests/filesystems/statmount/statmount_test_ns.c
index 063d9de46431..e500905e4c07 100644
--- a/tools/testing/selftests/filesystems/statmount/statmount_test_ns.c
+++ b/tools/testing/selftests/filesystems/statmount/statmount_test_ns.c
@@ -34,31 +34,6 @@ static void handle_result(int ret, const char *testname)
 		ksft_test_result_skip("%s\n", testname);
 }
 
-static inline int wait_for_pid(pid_t pid)
-{
-	int status, ret;
-
-again:
-	ret = waitpid(pid, &status, 0);
-	if (ret == -1) {
-		if (errno == EINTR)
-			goto again;
-
-		ksft_print_msg("waitpid returned -1, errno=%d\n", errno);
-		return -1;
-	}
-
-	if (!WIFEXITED(status)) {
-		ksft_print_msg(
-		       "waitpid !WIFEXITED, WIFSIGNALED=%d, WTERMSIG=%d\n",
-		       WIFSIGNALED(status), WTERMSIG(status));
-		return -1;
-	}
-
-	ret = WEXITSTATUS(status);
-	return ret;
-}
-
 static int get_mnt_ns_id(const char *mnt_ns, uint64_t *mnt_ns_id)
 {
 	int fd = open(mnt_ns, O_RDONLY);
-- 
2.47.3