Commit 22230cd2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e18afa5b 028abd92

arch/arm64/include/asm/unistd32.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ __SYSCALL(__NR_lseek, compat_sys_lseek) 
#define __NR_getpid 20

__SYSCALL(__NR_getpid, sys_getpid)

#define __NR_mount 21

__SYSCALL(__NR_mount, compat_sys_mount)

__SYSCALL(__NR_mount, sys_mount)

			/* 22 was sys_umount */

__SYSCALL(22, sys_ni_syscall)

#define __NR_setuid 23

arch/mips/kernel/syscalls/syscall_n32.tbl

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/mips/kernel/syscalls/syscall_o32.tbl

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/parisc/kernel/syscalls/syscall.tbl

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
18	common	stat			sys_newstat			compat_sys_newstat

19	common	lseek			sys_lseek			compat_sys_lseek

20	common	getpid			sys_getpid

21	common	mount			sys_mount			compat_sys_mount

21	common	mount			sys_mount

22	common	bind			sys_bind

23	common	setuid			sys_setuid

24	common	getuid			sys_getuid

arch/powerpc/kernel/syscalls/syscall.tbl

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
18	spu	oldstat				sys_ni_syscall

19	common	lseek				sys_lseek			compat_sys_lseek

20	common	getpid				sys_getpid

21	nospu	mount				sys_mount			compat_sys_mount

21	nospu	mount				sys_mount

22	32	umount				sys_oldumount

22	64	umount				sys_ni_syscall

22	spu	umount				sys_ni_syscall

CRA Git | Maintained and supported by SUSTech CRA and CCSE