| Message ID | 1694770587-9502-1-git-send-email-xuyang2018.jy@fujitsu.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] syscalls/renameat: Remove renameat fallback definition | expand |
Hi all, > Looking at man renameat, it was added into kernel 2.6.16 and since the > oldest kernel we support is 3.10 (see doc/supported-kernel-libc-versions > .txt) we can as well completely drop this fallback definition. Yang asked [1] also for removing entry in include/lapi/syscalls/aarch64.in and others, but I think we should keep it there. I'd definitely keep this till the release, but then it should be safe to remove this old fallback. Reviewed-by: Petr Vorel <pvorel@suse.cz> Kind regards, Petr [1] https://lore.kernel.org/ltp/040088ba-20f1-711f-3fe5-6d1d4782a015@fujitsu.com/
Hi Petr Thanks for your review. >Yang asked [1] also for removing entry in include/lapi/syscalls/aarch64.in and others, but I think we should keep it there. Of course, we should ensure user still can use different variants to test function ie use glibc call or syscall(syscall_number) when they have special aims , so I only remove these old fallback and not remove syscall number in ltp lapi/syscalls/*.in file. Especially, these syscalls/*in files should be consistent with these libc header in file as far as possible IMO. >I'd definitely keep this till the release, but then it should be safe to remove this old fallback. This sounds great. Best Regards Yang Xu
HI Ping. Best Regards Yang Xu Hi Petr Thanks for your review. Yang asked [1] also for removing entry in include/lapi/syscalls/aarch64.in and others, but I think we should keep it there. Of course, we should ensure user still can use different variants to test function ie use glibc call or syscall(syscall_number) when they have special aims , so I only remove these old fallback and not remove syscall number in ltp lapi/syscalls/*.in file. Especially, these syscalls/*in files should be consistent with these libc header in file as far as possible IMO. I'd definitely keep this till the release, but then it should be safe to remove this old fallback. This sounds great. Best Regards Yang Xu
Hi Xu, merged, thanks! Kind regards, Petr
Hi Xu, > Looking at man renameat, it was added into kernel 2.6.16 and since the > oldest kernel we support is 3.10 (see doc/supported-kernel-libc-versions > .txt) we can as well completely drop this fallback definition. BTW although man is correct, the lapi function was IMHO done due missing libc support. It was added in glibc 2.4, thus not sure why the support was added in 2014, probably to support the oldest distros. Also, without kernel support the function would not work at all, therefore it is irrelevant when readlinkat was added into kernel. Thus I dared to update the commit message. Kind regards, Petr
diff --git a/configure.ac b/configure.ac index 662c4c058..30a6f56e6 100644 --- a/configure.ac +++ b/configure.ac @@ -135,7 +135,6 @@ AC_CHECK_FUNCS_ONCE([ \ rand_r \ readlinkat \ recvmmsg \ - renameat \ renameat2 \ sched_getcpu \ sendmmsg \ diff --git a/include/lapi/renameat.h b/include/lapi/renameat.h deleted file mode 100644 index abf4c1d6e..000000000 --- a/include/lapi/renameat.h +++ /dev/null @@ -1,23 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * Copyright (c) International Business Machines Corp., 2007 - * Copyright (c) 2014 Fujitsu Ltd. - */ - -#ifndef LAPI_RENAMEAT_H__ -#define LAPI_RENAMEAT_H__ - -#include <sys/types.h> -#include "config.h" -#include "lapi/syscalls.h" - -#if !defined(HAVE_RENAMEAT) -static inline int renameat(int olddirfd, const char *oldpath, int newdirfd, - const char *newpath) -{ - return tst_syscall(__NR_renameat, olddirfd, oldpath, newdirfd, - newpath); -} -#endif - -#endif /* LAPI_RENAMEAT_H__ */ diff --git a/testcases/kernel/syscalls/renameat/renameat01.c b/testcases/kernel/syscalls/renameat/renameat01.c index 3de103563..c318a7971 100644 --- a/testcases/kernel/syscalls/renameat/renameat01.c +++ b/testcases/kernel/syscalls/renameat/renameat01.c @@ -50,7 +50,6 @@ #include "test.h" #include "safe_macros.h" #include "lapi/fcntl.h" -#include "lapi/renameat.h" #define MNTPOINT "mntpoint" #define TESTDIR "testdir"