]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
selftests/statmount: remove duplicate wait_for_pid()
authorChristian Brauner <brauner@kernel.org>
Mon, 23 Mar 2026 15:31:30 +0000 (16:31 +0100)
committerChristian Brauner <brauner@kernel.org>
Tue, 14 Apr 2026 07:30:31 +0000 (09:30 +0200)
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: 3ac7ea91f3d0 ("selftests: add FSMOUNT_NAMESPACE tests")
Cc: <stable@kernel.org> # mainline only
Signed-off-by: Christian Brauner <brauner@kernel.org>
tools/testing/selftests/filesystems/statmount/statmount_test_ns.c

index 063d9de46431633d68759167d1f56ba26a458429..e500905e4c078f255e78910e060b4ea04e865ad2 100644 (file)
@@ -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);