tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

syscalls: Cleanup references to sys_lookup_dcookie()

commit 'be65de6b03aa ("fs: Remove dcookies support")' removed the
syscall definition for lookup_dcookie. However, syscall tables still
point to the old sys_lookup_dcookie() definition. Update syscall tables
of all architectures to directly point to sys_ni_syscall() instead.

Signed-off-by: Sohil Mehta <sohil.mehta@intel.com>
Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Namhyung Kim <namhyung@kernel.org> # for perf
Acked-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Sohil Mehta and committed by
Arnd Bergmann ccab211a 43ff2214

+23 -27
+1 -1
arch/alpha/kernel/syscalls/syscall.tbl
··· 334 334 401 common io_submit sys_io_submit 335 335 402 common io_cancel sys_io_cancel 336 336 405 common exit_group sys_exit_group 337 - 406 common lookup_dcookie sys_lookup_dcookie 337 + 406 common lookup_dcookie sys_ni_syscall 338 338 407 common epoll_create sys_epoll_create 339 339 408 common epoll_ctl sys_epoll_ctl 340 340 409 common epoll_wait sys_epoll_wait
+1 -1
arch/arm/tools/syscall.tbl
··· 263 263 246 common io_submit sys_io_submit 264 264 247 common io_cancel sys_io_cancel 265 265 248 common exit_group sys_exit_group 266 - 249 common lookup_dcookie sys_lookup_dcookie 266 + 249 common lookup_dcookie sys_ni_syscall 267 267 250 common epoll_create sys_epoll_create 268 268 251 common epoll_ctl sys_epoll_ctl sys_oabi_epoll_ctl 269 269 252 common epoll_wait sys_epoll_wait
+2 -2
arch/arm64/include/asm/unistd32.h
··· 508 508 __SYSCALL(__NR_io_cancel, sys_io_cancel) 509 509 #define __NR_exit_group 248 510 510 __SYSCALL(__NR_exit_group, sys_exit_group) 511 - #define __NR_lookup_dcookie 249 512 - __SYSCALL(__NR_lookup_dcookie, compat_sys_lookup_dcookie) 511 + /* 249 was lookup_dcookie */ 512 + __SYSCALL(249, sys_ni_syscall) 513 513 #define __NR_epoll_create 250 514 514 __SYSCALL(__NR_epoll_create, sys_epoll_create) 515 515 #define __NR_epoll_ctl 251
+1 -1
arch/m68k/kernel/syscalls/syscall.tbl
··· 255 255 245 common io_cancel sys_io_cancel 256 256 246 common fadvise64 sys_fadvise64 257 257 247 common exit_group sys_exit_group 258 - 248 common lookup_dcookie sys_lookup_dcookie 258 + 248 common lookup_dcookie sys_ni_syscall 259 259 249 common epoll_create sys_epoll_create 260 260 250 common epoll_ctl sys_epoll_ctl 261 261 251 common epoll_wait sys_epoll_wait
+1 -1
arch/microblaze/kernel/syscalls/syscall.tbl
··· 260 260 250 common fadvise64 sys_fadvise64 261 261 # 251 is available for reuse (was briefly sys_set_zone_reclaim) 262 262 252 common exit_group sys_exit_group 263 - 253 common lookup_dcookie sys_lookup_dcookie 263 + 253 common lookup_dcookie sys_ni_syscall 264 264 254 common epoll_create sys_epoll_create 265 265 255 common epoll_ctl sys_epoll_ctl 266 266 256 common epoll_wait sys_epoll_wait
+1 -1
arch/mips/kernel/syscalls/syscall_n32.tbl
··· 214 214 203 n32 io_submit compat_sys_io_submit 215 215 204 n32 io_cancel sys_io_cancel 216 216 205 n32 exit_group sys_exit_group 217 - 206 n32 lookup_dcookie sys_lookup_dcookie 217 + 206 n32 lookup_dcookie sys_ni_syscall 218 218 207 n32 epoll_create sys_epoll_create 219 219 208 n32 epoll_ctl sys_epoll_ctl 220 220 209 n32 epoll_wait sys_epoll_wait
+1 -1
arch/mips/kernel/syscalls/syscall_n64.tbl
··· 214 214 203 n64 io_submit sys_io_submit 215 215 204 n64 io_cancel sys_io_cancel 216 216 205 n64 exit_group sys_exit_group 217 - 206 n64 lookup_dcookie sys_lookup_dcookie 217 + 206 n64 lookup_dcookie sys_ni_syscall 218 218 207 n64 epoll_create sys_epoll_create 219 219 208 n64 epoll_ctl sys_epoll_ctl 220 220 209 n64 epoll_wait sys_epoll_wait
+1 -1
arch/mips/kernel/syscalls/syscall_o32.tbl
··· 258 258 244 o32 io_submit sys_io_submit compat_sys_io_submit 259 259 245 o32 io_cancel sys_io_cancel 260 260 246 o32 exit_group sys_exit_group 261 - 247 o32 lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie 261 + 247 o32 lookup_dcookie sys_ni_syscall 262 262 248 o32 epoll_create sys_epoll_create 263 263 249 o32 epoll_ctl sys_epoll_ctl 264 264 250 o32 epoll_wait sys_epoll_wait
+1 -1
arch/parisc/kernel/syscalls/syscall.tbl
··· 245 245 # 220 was alloc_hugepages 246 246 # 221 was free_hugepages 247 247 222 common exit_group sys_exit_group 248 - 223 common lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie 248 + 223 common lookup_dcookie sys_ni_syscall 249 249 224 common epoll_create sys_epoll_create 250 250 225 common epoll_ctl sys_epoll_ctl 251 251 226 common epoll_wait sys_epoll_wait
+1 -1
arch/powerpc/kernel/syscalls/syscall.tbl
··· 294 294 233 32 fadvise64 sys_ppc32_fadvise64 compat_sys_ppc32_fadvise64 295 295 233 64 fadvise64 sys_fadvise64 296 296 234 nospu exit_group sys_exit_group 297 - 235 nospu lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie 297 + 235 nospu lookup_dcookie sys_ni_syscall 298 298 236 common epoll_create sys_epoll_create 299 299 237 common epoll_ctl sys_epoll_ctl 300 300 238 common epoll_wait sys_epoll_wait
+1 -1
arch/s390/kernel/syscalls/syscall.tbl
··· 100 100 106 common stat sys_newstat compat_sys_newstat 101 101 107 common lstat sys_newlstat compat_sys_newlstat 102 102 108 common fstat sys_newfstat compat_sys_newfstat 103 - 110 common lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie 103 + 110 common lookup_dcookie - - 104 104 111 common vhangup sys_vhangup sys_vhangup 105 105 112 common idle - - 106 106 114 common wait4 sys_wait4 compat_sys_wait4
+1 -1
arch/sh/kernel/syscalls/syscall.tbl
··· 260 260 250 common fadvise64 sys_fadvise64 261 261 # 251 is unused 262 262 252 common exit_group sys_exit_group 263 - 253 common lookup_dcookie sys_lookup_dcookie 263 + 253 common lookup_dcookie sys_ni_syscall 264 264 254 common epoll_create sys_epoll_create 265 265 255 common epoll_ctl sys_epoll_ctl 266 266 256 common epoll_wait sys_epoll_wait
+1 -1
arch/sparc/kernel/syscalls/syscall.tbl
··· 249 249 205 common readahead sys_readahead compat_sys_readahead 250 250 206 common socketcall sys_socketcall sys32_socketcall 251 251 207 common syslog sys_syslog 252 - 208 common lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie 252 + 208 common lookup_dcookie sys_ni_syscall 253 253 209 common fadvise64 sys_fadvise64 compat_sys_fadvise64 254 254 210 common fadvise64_64 sys_fadvise64_64 compat_sys_fadvise64_64 255 255 211 common tgkill sys_tgkill
+1 -1
arch/x86/entry/syscalls/syscall_32.tbl
··· 264 264 250 i386 fadvise64 sys_ia32_fadvise64 265 265 # 251 is available for reuse (was briefly sys_set_zone_reclaim) 266 266 252 i386 exit_group sys_exit_group 267 - 253 i386 lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie 267 + 253 i386 lookup_dcookie 268 268 254 i386 epoll_create sys_epoll_create 269 269 255 i386 epoll_ctl sys_epoll_ctl 270 270 256 i386 epoll_wait sys_epoll_wait
+1 -1
arch/x86/entry/syscalls/syscall_64.tbl
··· 220 220 209 64 io_submit sys_io_submit 221 221 210 common io_cancel sys_io_cancel 222 222 211 64 get_thread_area 223 - 212 common lookup_dcookie sys_lookup_dcookie 223 + 212 common lookup_dcookie 224 224 213 common epoll_create sys_epoll_create 225 225 214 64 epoll_ctl_old 226 226 215 64 epoll_wait_old
+1 -1
arch/xtensa/kernel/syscalls/syscall.tbl
··· 273 273 252 common timer_getoverrun sys_timer_getoverrun 274 274 # System 275 275 253 common reserved253 sys_ni_syscall 276 - 254 common lookup_dcookie sys_lookup_dcookie 276 + 254 common lookup_dcookie sys_ni_syscall 277 277 255 common available255 sys_ni_syscall 278 278 256 common add_key sys_add_key 279 279 257 common request_key sys_request_key
-1
include/linux/compat.h
··· 581 581 struct io_event __user *events, 582 582 struct __kernel_timespec __user *timeout, 583 583 const struct __compat_aio_sigset __user *usig); 584 - asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t); 585 584 asmlinkage long compat_sys_epoll_pwait(int epfd, 586 585 struct epoll_event __user *events, 587 586 int maxevents, int timeout,
-1
include/linux/syscalls.h
··· 355 355 const char __user *name); 356 356 asmlinkage long sys_fremovexattr(int fd, const char __user *name); 357 357 asmlinkage long sys_getcwd(char __user *buf, unsigned long size); 358 - asmlinkage long sys_lookup_dcookie(u64 cookie64, char __user *buf, size_t len); 359 358 asmlinkage long sys_eventfd2(unsigned int count, int flags); 360 359 asmlinkage long sys_epoll_create1(int flags); 361 360 asmlinkage long sys_epoll_ctl(int epfd, int op, int fd,
+1 -1
include/uapi/asm-generic/unistd.h
··· 71 71 #define __NR_getcwd 17 72 72 __SYSCALL(__NR_getcwd, sys_getcwd) 73 73 #define __NR_lookup_dcookie 18 74 - __SC_COMP(__NR_lookup_dcookie, sys_lookup_dcookie, compat_sys_lookup_dcookie) 74 + __SYSCALL(__NR_lookup_dcookie, sys_ni_syscall) 75 75 #define __NR_eventfd2 19 76 76 __SYSCALL(__NR_eventfd2, sys_eventfd2) 77 77 #define __NR_epoll_create1 20
-2
kernel/sys_ni.c
··· 51 51 COND_SYSCALL(io_uring_setup); 52 52 COND_SYSCALL(io_uring_enter); 53 53 COND_SYSCALL(io_uring_register); 54 - COND_SYSCALL(lookup_dcookie); 55 - COND_SYSCALL_COMPAT(lookup_dcookie); 56 54 COND_SYSCALL(eventfd2); 57 55 COND_SYSCALL(epoll_create1); 58 56 COND_SYSCALL(epoll_ctl);
+1 -1
tools/include/uapi/asm-generic/unistd.h
··· 71 71 #define __NR_getcwd 17 72 72 __SYSCALL(__NR_getcwd, sys_getcwd) 73 73 #define __NR_lookup_dcookie 18 74 - __SC_COMP(__NR_lookup_dcookie, sys_lookup_dcookie, compat_sys_lookup_dcookie) 74 + __SYSCALL(__NR_lookup_dcookie, sys_ni_syscall) 75 75 #define __NR_eventfd2 19 76 76 __SYSCALL(__NR_eventfd2, sys_eventfd2) 77 77 #define __NR_epoll_create1 20
+1 -1
tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl
··· 214 214 203 n64 io_submit sys_io_submit 215 215 204 n64 io_cancel sys_io_cancel 216 216 205 n64 exit_group sys_exit_group 217 - 206 n64 lookup_dcookie sys_lookup_dcookie 217 + 206 n64 lookup_dcookie sys_ni_syscall 218 218 207 n64 epoll_create sys_epoll_create 219 219 208 n64 epoll_ctl sys_epoll_ctl 220 220 209 n64 epoll_wait sys_epoll_wait
+1 -1
tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
··· 294 294 233 32 fadvise64 sys_ppc32_fadvise64 compat_sys_ppc32_fadvise64 295 295 233 64 fadvise64 sys_fadvise64 296 296 234 nospu exit_group sys_exit_group 297 - 235 nospu lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie 297 + 235 nospu lookup_dcookie sys_ni_syscall 298 298 236 common epoll_create sys_epoll_create 299 299 237 common epoll_ctl sys_epoll_ctl 300 300 238 common epoll_wait sys_epoll_wait
+1 -1
tools/perf/arch/s390/entry/syscalls/syscall.tbl
··· 100 100 106 common stat sys_newstat compat_sys_newstat 101 101 107 common lstat sys_newlstat compat_sys_newlstat 102 102 108 common fstat sys_newfstat compat_sys_newfstat 103 - 110 common lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie 103 + 110 common lookup_dcookie - - 104 104 111 common vhangup sys_vhangup sys_vhangup 105 105 112 common idle - - 106 106 114 common wait4 sys_wait4 compat_sys_wait4
+1 -1
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
··· 220 220 209 64 io_submit sys_io_submit 221 221 210 common io_cancel sys_io_cancel 222 222 211 64 get_thread_area 223 - 212 common lookup_dcookie sys_lookup_dcookie 223 + 212 common lookup_dcookie 224 224 213 common epoll_create sys_epoll_create 225 225 214 64 epoll_ctl_old 226 226 215 64 epoll_wait_old