diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-13 01:44:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-13 01:44:57 +0200 |
| commit | 22230cd2c55bd27ee2c3a3def97c0d5577a75b82 (patch) | |
| tree | a05a58301228b3fff3ca7b44fb3ff4cbfefed4a0 /arch/mips/kernel/syscalls | |
| parent | Merge branch 'work.quota-compat' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | fs: remove compat_sys_mount (diff) | |
| download | linux-22230cd2c55bd27ee2c3a3def97c0d5577a75b82.tar.xz linux-22230cd2c55bd27ee2c3a3def97c0d5577a75b82.zip | |
Merge branch 'compat.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull compat mount cleanups from Al Viro:
"The last remnants of mount(2) compat buried by Christoph.
Buried into NFS, that is.
Generally I'm less enthusiastic about "let's use in_compat_syscall()
deep in call chain" kind of approach than Christoph seems to be, but
in this case it's warranted - that had been an NFS-specific wart,
hopefully not to be repeated in any other filesystems (read: any new
filesystem introducing non-text mount options will get NAKed even if
it doesn't mess the layout up).
IOW, not worth trying to grow an infrastructure that would avoid that
use of in_compat_syscall()..."
* 'compat.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs: remove compat_sys_mount
fs,nfs: lift compat nfs4 mount data handling into the nfs code
nfs: simplify nfs4_parse_monolithic
Diffstat (limited to 'arch/mips/kernel/syscalls')
| -rw-r--r-- | arch/mips/kernel/syscalls/syscall_n32.tbl | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/syscalls/syscall_o32.tbl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl index 0bc2e0fcf1ee..cf72a0206a87 100644 --- a/arch/mips/kernel/syscalls/syscall_n32.tbl +++ b/arch/mips/kernel/syscalls/syscall_n32.tbl @@ -167,7 +167,7 @@ 157 n32 sync sys_sync 158 n32 acct sys_acct 159 n32 settimeofday compat_sys_settimeofday -160 n32 mount compat_sys_mount +160 n32 mount sys_mount 161 n32 umount2 sys_umount 162 n32 swapon sys_swapon 163 n32 swapoff sys_swapoff diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl index b408c13b9342..a17aab5abeb2 100644 --- a/arch/mips/kernel/syscalls/syscall_o32.tbl +++ b/arch/mips/kernel/syscalls/syscall_o32.tbl @@ -29,7 +29,7 @@ 18 o32 unused18 sys_ni_syscall 19 o32 lseek sys_lseek 20 o32 getpid sys_getpid -21 o32 mount sys_mount compat_sys_mount +21 o32 mount sys_mount 22 o32 umount sys_oldumount 23 o32 setuid sys_setuid 24 o32 getuid sys_getuid |