diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-13 02:44:57 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-13 02:44:57 +0300 |
| commit | 22230cd2c55bd27ee2c3a3def97c0d5577a75b82 (patch) | |
| tree | a05a58301228b3fff3ca7b44fb3ff4cbfefed4a0 /include | |
| parent | e18afa5bfa4a2f0e07b0864370485df701dacbc1 (diff) | |
| parent | 028abd9222df0cf5855dab5014a5ebaf06f90565 (diff) | |
| download | linux-22230cd2c55bd27ee2c3a3def97c0d5577a75b82.tar.xz | |
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 'include')
| -rw-r--r-- | include/linux/compat.h | 6 | ||||
| -rw-r--r-- | include/uapi/asm-generic/unistd.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 34c48eb1e773..14d514233e1d 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -516,12 +516,6 @@ asmlinkage long compat_sys_fcntl64(unsigned int fd, unsigned int cmd, asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd, compat_ulong_t arg); -/* fs/namespace.c */ -asmlinkage long compat_sys_mount(const char __user *dev_name, - const char __user *dir_name, - const char __user *type, compat_ulong_t flags, - const void __user *data); - /* fs/open.c */ asmlinkage long compat_sys_statfs(const char __user *pathname, struct compat_statfs __user *buf); diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index c1dfe99c9c3f..f2b5d72a46c2 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -140,7 +140,7 @@ __SYSCALL(__NR_renameat, sys_renameat) #define __NR_umount2 39 __SYSCALL(__NR_umount2, sys_umount) #define __NR_mount 40 -__SC_COMP(__NR_mount, sys_mount, compat_sys_mount) +__SYSCALL(__NR_mount, sys_mount) #define __NR_pivot_root 41 __SYSCALL(__NR_pivot_root, sys_pivot_root) |