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 <[email protected]>
Reviewed-by: Randy Dunlap <[email protected]>
Acked-by: Namhyung Kim <[email protected]> # for perf
Acked-by: Russell King (Oracle) <[email protected]>
Acked-by: Geert Uytterhoeven <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>

diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl
index ad37569d05072acf431c55e4270843b05d315a72..26a32f8e47d59dae2376ec74fd377e61d3b3b7ec 100644 (file)
--- a/arch/alpha/kernel/syscalls/syscall.tbl
+++ b/arch/alpha/kernel/syscalls/syscall.tbl
@@ -334,7 +334,7 @@
 401    common  io_submit                       sys_io_submit
 402    common  io_cancel                       sys_io_cancel
 405    common  exit_group                      sys_exit_group
-406    common  lookup_dcookie                  sys_lookup_dcookie
+406    common  lookup_dcookie                  sys_ni_syscall
 407    common  epoll_create                    sys_epoll_create
 408    common  epoll_ctl                       sys_epoll_ctl
 409    common  epoll_wait                      sys_epoll_wait

diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl
index c572d6c3dee0fd0f6370a9181099ed0840a0b8cd..04d8e491d8b46f1701e9985d6c103a34f1511fc1 100644 (file)
--- a/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@ -263,7 +263,7 @@
 246    common  io_submit               sys_io_submit
 247    common  io_cancel               sys_io_cancel
 248    common  exit_group              sys_exit_group
-249    common  lookup_dcookie          sys_lookup_dcookie
+249    common  lookup_dcookie          sys_ni_syscall
 250    common  epoll_create            sys_epoll_create
 251    common  epoll_ctl               sys_epoll_ctl           sys_oabi_epoll_ctl
 252    common  epoll_wait              sys_epoll_wait

diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
index 78b68311ec8192c2afb6d10ba92ebf5556a34b54..9110be82dfaa973b058564ecbc7a6a7bcffcf906 100644 (file)
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@ -508,8 +508,8 @@ __SYSCALL(__NR_io_submit, compat_sys_io_submit)
 __SYSCALL(__NR_io_cancel, sys_io_cancel)
 #define __NR_exit_group 248
 __SYSCALL(__NR_exit_group, sys_exit_group)
-#define __NR_lookup_dcookie 249
-__SYSCALL(__NR_lookup_dcookie, compat_sys_lookup_dcookie)
+                       /* 249 was lookup_dcookie */
+__SYSCALL(249, sys_ni_syscall)
 #define __NR_epoll_create 250
 __SYSCALL(__NR_epoll_create, sys_epoll_create)
 #define __NR_epoll_ctl 251

diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/syscalls/syscall.tbl
index 259ceb125367d45a5ce5fef4b8171e663ffff533..f9d1f2d3f0670a983d9700b2f2e9858800d5a167 100644 (file)
--- a/arch/m68k/kernel/syscalls/syscall.tbl
+++ b/arch/m68k/kernel/syscalls/syscall.tbl
@@ -255,7 +255,7 @@
 245    common  io_cancel                       sys_io_cancel
 246    common  fadvise64                       sys_fadvise64
 247    common  exit_group                      sys_exit_group
-248    common  lookup_dcookie                  sys_lookup_dcookie
+248    common  lookup_dcookie                  sys_ni_syscall
 249    common  epoll_create                    sys_epoll_create
 250    common  epoll_ctl                       sys_epoll_ctl
 251    common  epoll_wait                      sys_epoll_wait

diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/kernel/syscalls/syscall.tbl
index a3798c2637fd197605fbd773c433a9c144b9f10a..185fe73d9bbf7e858de6815f08b8c24c1044739b 100644 (file)
--- a/arch/microblaze/kernel/syscalls/syscall.tbl
+++ b/arch/microblaze/kernel/syscalls/syscall.tbl
@@ -260,7 +260,7 @@
 250    common  fadvise64                       sys_fadvise64
 # 251 is available for reuse (was briefly sys_set_zone_reclaim)
 252    common  exit_group                      sys_exit_group
-253    common  lookup_dcookie                  sys_lookup_dcookie
+253    common  lookup_dcookie                  sys_ni_syscall
 254    common  epoll_create                    sys_epoll_create
 255    common  epoll_ctl                       sys_epoll_ctl
 256    common  epoll_wait                      sys_epoll_wait

diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl
index 152034b8e0a0f3166a8b9e92e9edea56b80c0a32..08f33e7c2896132bb6dd13a6525a515fa56ce7e4 100644 (file)
--- a/arch/mips/kernel/syscalls/syscall_n32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n32.tbl
@@ -214,7 +214,7 @@
 203    n32     io_submit                       compat_sys_io_submit
 204    n32     io_cancel                       sys_io_cancel
 205    n32     exit_group                      sys_exit_group
-206    n32     lookup_dcookie                  sys_lookup_dcookie
+206    n32     lookup_dcookie                  sys_ni_syscall
 207    n32     epoll_create                    sys_epoll_create
 208    n32     epoll_ctl                       sys_epoll_ctl
 209    n32     epoll_wait                      sys_epoll_wait

diff --git a/arch/mips/kernel/syscalls/syscall_n64.tbl b/arch/mips/kernel/syscalls/syscall_n64.tbl
index cb5e757f6621c885f441e3f258591b0f32ffb84b..80be0e98ea0c5488ef27a08637e8a12b991c6eae 100644 (file)
--- a/arch/mips/kernel/syscalls/syscall_n64.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n64.tbl
@@ -214,7 +214,7 @@
 203    n64     io_submit                       sys_io_submit
 204    n64     io_cancel                       sys_io_cancel
 205    n64     exit_group                      sys_exit_group
-206    n64     lookup_dcookie                  sys_lookup_dcookie
+206    n64     lookup_dcookie                  sys_ni_syscall
 207    n64     epoll_create                    sys_epoll_create
 208    n64     epoll_ctl                       sys_epoll_ctl
 209    n64     epoll_wait                      sys_epoll_wait

diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl
index 1a646813afdca4b128443b8c364a018365f35cd7..310c7e839b6975eb60eb61e247bd22351a95ee0b 100644 (file)
--- a/arch/mips/kernel/syscalls/syscall_o32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_o32.tbl
@@ -258,7 +258,7 @@
 244    o32     io_submit                       sys_io_submit                   compat_sys_io_submit
 245    o32     io_cancel                       sys_io_cancel
 246    o32     exit_group                      sys_exit_group
-247    o32     lookup_dcookie                  sys_lookup_dcookie              compat_sys_lookup_dcookie
+247    o32     lookup_dcookie                  sys_ni_syscall
 248    o32     epoll_create                    sys_epoll_create
 249    o32     epoll_ctl                       sys_epoll_ctl
 250    o32     epoll_wait                      sys_epoll_wait

diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl
index e97c175b56f965156bdfd680128f1b78e40f5999..5410ff9456ae5c8ccc4f8040b45a3a930e2c01fb 100644 (file)
--- a/arch/parisc/kernel/syscalls/syscall.tbl
+++ b/arch/parisc/kernel/syscalls/syscall.tbl
@@ -245,7 +245,7 @@
 # 220 was alloc_hugepages
 # 221 was free_hugepages
 222    common  exit_group              sys_exit_group
-223    common  lookup_dcookie          sys_lookup_dcookie              compat_sys_lookup_dcookie
+223    common  lookup_dcookie          sys_ni_syscall
 224    common  epoll_create            sys_epoll_create
 225    common  epoll_ctl               sys_epoll_ctl
 226    common  epoll_wait              sys_epoll_wait

diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl
index 20e50586e8a26c345b89682b7078e929034edfa5..e1412519b4ad9ae2a38750a1c4e3dce63ce83ecb 100644 (file)
--- a/arch/powerpc/kernel/syscalls/syscall.tbl
+++ b/arch/powerpc/kernel/syscalls/syscall.tbl
@@ -294,7 +294,7 @@
 233    32      fadvise64                       sys_ppc32_fadvise64             compat_sys_ppc32_fadvise64
 233    64      fadvise64                       sys_fadvise64
 234    nospu   exit_group                      sys_exit_group
-235    nospu   lookup_dcookie                  sys_lookup_dcookie              compat_sys_lookup_dcookie
+235    nospu   lookup_dcookie                  sys_ni_syscall
 236    common  epoll_create                    sys_epoll_create
 237    common  epoll_ctl                       sys_epoll_ctl
 238    common  epoll_wait                      sys_epoll_wait

diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl
index 0122cc156952cf55b630584a983702d12eddcc62..cc0bc144b6616226b7df2aa717a7e57b798756d5 100644 (file)
--- a/arch/s390/kernel/syscalls/syscall.tbl
+++ b/arch/s390/kernel/syscalls/syscall.tbl
@@ -100,7 +100,7 @@
 106  common    stat                    sys_newstat                     compat_sys_newstat
 107  common    lstat                   sys_newlstat                    compat_sys_newlstat
 108  common    fstat                   sys_newfstat                    compat_sys_newfstat
-110  common    lookup_dcookie          sys_lookup_dcookie              compat_sys_lookup_dcookie
+110  common    lookup_dcookie          -                               -
 111  common    vhangup                 sys_vhangup                     sys_vhangup
 112  common    idle                    -                               -
 114  common    wait4                   sys_wait4                       compat_sys_wait4

diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl
index e90d585c4d3e739011d596ced9b2dc19a6e2c0c1..17ca589768498e91f160005147aba363b042a780 100644 (file)
--- a/arch/sh/kernel/syscalls/syscall.tbl
+++ b/arch/sh/kernel/syscalls/syscall.tbl
@@ -260,7 +260,7 @@
 250    common  fadvise64                       sys_fadvise64
 # 251 is unused
 252    common  exit_group                      sys_exit_group
-253    common  lookup_dcookie                  sys_lookup_dcookie
+253    common  lookup_dcookie                  sys_ni_syscall
 254    common  epoll_create                    sys_epoll_create
 255    common  epoll_ctl                       sys_epoll_ctl
 256    common  epoll_wait                      sys_epoll_wait

diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl
index 4ed06c71c43fb76db32882217172f3b4baa2976d..3f72970cf9837ef6793fb309c922ca4613b9bfec 100644 (file)
--- a/arch/sparc/kernel/syscalls/syscall.tbl
+++ b/arch/sparc/kernel/syscalls/syscall.tbl
@@ -249,7 +249,7 @@
 205    common  readahead               sys_readahead                   compat_sys_readahead
 206    common  socketcall              sys_socketcall                  sys32_socketcall
 207    common  syslog                  sys_syslog
-208    common  lookup_dcookie          sys_lookup_dcookie              compat_sys_lookup_dcookie
+208    common  lookup_dcookie          sys_ni_syscall
 209    common  fadvise64               sys_fadvise64                   compat_sys_fadvise64
 210    common  fadvise64_64            sys_fadvise64_64                compat_sys_fadvise64_64
 211    common  tgkill                  sys_tgkill

diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl
index 2d0b1bd866ead6738e40f8b21cf2808ef66ae857..6d0286bbbe276d4bda23a695b82e28a3e041cffe 100644 (file)
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@ -264,7 +264,7 @@
 250    i386    fadvise64               sys_ia32_fadvise64
 # 251 is available for reuse (was briefly sys_set_zone_reclaim)
 252    i386    exit_group              sys_exit_group
-253    i386    lookup_dcookie          sys_lookup_dcookie              compat_sys_lookup_dcookie
+253    i386    lookup_dcookie
 254    i386    epoll_create            sys_epoll_create
 255    i386    epoll_ctl               sys_epoll_ctl
 256    i386    epoll_wait              sys_epoll_wait

diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl
index 1d6eee30eceb22abb1b9f7916a91b25823579e24..2a62eaf30d69a3f016be8587e85d4a409d19f777 100644 (file)
--- a/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/arch/x86/entry/syscalls/syscall_64.tbl
@@ -220,7 +220,7 @@
 209    64      io_submit               sys_io_submit
 210    common  io_cancel               sys_io_cancel
 211    64      get_thread_area
-212    common  lookup_dcookie          sys_lookup_dcookie
+212    common  lookup_dcookie
 213    common  epoll_create            sys_epoll_create
 214    64      epoll_ctl_old
 215    64      epoll_wait_old

diff --git a/arch/xtensa/kernel/syscalls/syscall.tbl b/arch/xtensa/kernel/syscalls/syscall.tbl
index fc1a4f3c81d9b7e6c5cb0b698e251fad31534c4d..351521b2e84162f40a8dd511059dd31b12824adf 100644 (file)
--- a/arch/xtensa/kernel/syscalls/syscall.tbl
+++ b/arch/xtensa/kernel/syscalls/syscall.tbl
@@ -273,7 +273,7 @@
 252    common  timer_getoverrun                sys_timer_getoverrun
 # System
 253    common  reserved253                     sys_ni_syscall
-254    common  lookup_dcookie                  sys_lookup_dcookie
+254    common  lookup_dcookie                  sys_ni_syscall
 255    common  available255                    sys_ni_syscall
 256    common  add_key                         sys_add_key
 257    common  request_key                     sys_request_key

diff --git a/include/linux/compat.h b/include/linux/compat.h
index 1cfa4f0f490aa21ce7eda7f2a3ecc81a7bccde33..233f61ec8afca38feebdca1990752cf2ba22873b 100644 (file)
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -581,7 +581,6 @@ asmlinkage long compat_sys_io_pgetevents_time64(compat_aio_context_t ctx_id,
                                        struct io_event __user *events,
                                        struct __kernel_timespec __user *timeout,
                                        const struct __compat_aio_sigset __user *usig);
-asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
 asmlinkage long compat_sys_epoll_pwait(int epfd,
                        struct epoll_event __user *events,
                        int maxevents, int timeout,

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 22bc6bc147f899d1af6434d9695369b156ebc410..a031613bf966abaea039813b86971060c55e9a8c 100644 (file)
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -355,7 +355,6 @@ asmlinkage long sys_lremovexattr(const char __user *path,
                                 const char __user *name);
 asmlinkage long sys_fremovexattr(int fd, const char __user *name);
 asmlinkage long sys_getcwd(char __user *buf, unsigned long size);
-asmlinkage long sys_lookup_dcookie(u64 cookie64, char __user *buf, size_t len);
 asmlinkage long sys_eventfd2(unsigned int count, int flags);
 asmlinkage long sys_epoll_create1(int flags);
 asmlinkage long sys_epoll_ctl(int epfd, int op, int fd,

diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
index abe087c53b4b04348431716c1cb638b99d5a788a..76d94644539127e5ba6228b2250ebd96aff92cdf 100644 (file)
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@ -71,7 +71,7 @@ __SYSCALL(__NR_fremovexattr, sys_fremovexattr)
 #define __NR_getcwd 17
 __SYSCALL(__NR_getcwd, sys_getcwd)
 #define __NR_lookup_dcookie 18
-__SC_COMP(__NR_lookup_dcookie, sys_lookup_dcookie, compat_sys_lookup_dcookie)
+__SYSCALL(__NR_lookup_dcookie, sys_ni_syscall)
 #define __NR_eventfd2 19
 __SYSCALL(__NR_eventfd2, sys_eventfd2)
 #define __NR_epoll_create1 20

diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index e137c1385c569ee573d5234dbe2fc59d036a715b..d6eaaaf9cf770d4144fb8ca52d3e9bdc653ae490 100644 (file)
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -51,8 +51,6 @@ COND_SYSCALL_COMPAT(io_pgetevents);
 COND_SYSCALL(io_uring_setup);
 COND_SYSCALL(io_uring_enter);
 COND_SYSCALL(io_uring_register);
-COND_SYSCALL(lookup_dcookie);
-COND_SYSCALL_COMPAT(lookup_dcookie);
 COND_SYSCALL(eventfd2);
 COND_SYSCALL(epoll_create1);
 COND_SYSCALL(epoll_ctl);

diff --git a/tools/include/uapi/asm-generic/unistd.h b/tools/include/uapi/asm-generic/unistd.h
index fd6c1cb585db43c4e9bbbcffc8ee19a34325debe..7ea3875137e9c5836be09e5933298f40f5534094 100644 (file)
--- a/tools/include/uapi/asm-generic/unistd.h
+++ b/tools/include/uapi/asm-generic/unistd.h
@@ -71,7 +71,7 @@ __SYSCALL(__NR_fremovexattr, sys_fremovexattr)
 #define __NR_getcwd 17
 __SYSCALL(__NR_getcwd, sys_getcwd)
 #define __NR_lookup_dcookie 18
-__SC_COMP(__NR_lookup_dcookie, sys_lookup_dcookie, compat_sys_lookup_dcookie)
+__SYSCALL(__NR_lookup_dcookie, sys_ni_syscall)
 #define __NR_eventfd2 19
 __SYSCALL(__NR_eventfd2, sys_eventfd2)
 #define __NR_epoll_create1 20

diff --git a/tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl b/tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl
index cfda2511badf3ad0f4ca561eab0b01fd538495f5..478fe63601fc5a7af7b5b94805aab6d2591595d1 100644 (file)
--- a/tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl
+++ b/tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl
@@ -214,7 +214,7 @@
 203    n64     io_submit                       sys_io_submit
 204    n64     io_cancel                       sys_io_cancel
 205    n64     exit_group                      sys_exit_group
-206    n64     lookup_dcookie                  sys_lookup_dcookie
+206    n64     lookup_dcookie                  sys_ni_syscall
 207    n64     epoll_create                    sys_epoll_create
 208    n64     epoll_ctl                       sys_epoll_ctl
 209    n64     epoll_wait                      sys_epoll_wait

diff --git a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
index 8c0b08b7a80ec4b75fbc059054cf745ac89ad3dc..1b7777e5f9fff2d97b0ee3d0908173a032e28bfd 100644 (file)
--- a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
+++ b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
@@ -294,7 +294,7 @@
 233    32      fadvise64                       sys_ppc32_fadvise64             compat_sys_ppc32_fadvise64
 233    64      fadvise64                       sys_fadvise64
 234    nospu   exit_group                      sys_exit_group
-235    nospu   lookup_dcookie                  sys_lookup_dcookie              compat_sys_lookup_dcookie
+235    nospu   lookup_dcookie                  sys_ni_syscall
 236    common  epoll_create                    sys_epoll_create
 237    common  epoll_ctl                       sys_epoll_ctl
 238    common  epoll_wait                      sys_epoll_wait

diff --git a/tools/perf/arch/s390/entry/syscalls/syscall.tbl b/tools/perf/arch/s390/entry/syscalls/syscall.tbl
index a6935af2235cab6cbc993a2efdb3e6fb18abcaeb..11782be77f572f9edcb84a78b535c3c7af1825ba 100644 (file)
--- a/tools/perf/arch/s390/entry/syscalls/syscall.tbl
+++ b/tools/perf/arch/s390/entry/syscalls/syscall.tbl
@@ -100,7 +100,7 @@
 106  common    stat                    sys_newstat                     compat_sys_newstat
 107  common    lstat                   sys_newlstat                    compat_sys_newlstat
 108  common    fstat                   sys_newfstat                    compat_sys_newfstat
-110  common    lookup_dcookie          sys_lookup_dcookie              compat_sys_lookup_dcookie
+110  common    lookup_dcookie          -                               -
 111  common    vhangup                 sys_vhangup                     sys_vhangup
 112  common    idle                    -                               -
 114  common    wait4                   sys_wait4                       compat_sys_wait4

diff --git a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
index 227538b0ce801eeba96e10d8214e7847b77cee88..27f78821453bee4ea52d555733751c6480a34cde 100644 (file)
--- a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
@@ -220,7 +220,7 @@
 209    64      io_submit               sys_io_submit
 210    common  io_cancel               sys_io_cancel
 211    64      get_thread_area
-212    common  lookup_dcookie          sys_lookup_dcookie
+212    common  lookup_dcookie
 213    common  epoll_create            sys_epoll_create
 214    64      epoll_ctl_old
 215    64      epoll_wait_old