From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Oct 2020 23:44:57 +0000 (-0700)
Subject: Merge branch 'compat.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=22230cd2c55bd27ee2c3a3def97c0d5577a75b82;p=linux.git

Merge branch 'compat.mount' of git://git./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
---

22230cd2c55bd27ee2c3a3def97c0d5577a75b82
diff --cc fs/namespace.c
index 32a0b9146757e,12b431b61462b..294e05a13d173
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@@ -3072,10 -3072,10 +3072,10 @@@ static void shrink_submounts(struct mou
  	}
  }
  
- void *copy_mount_options(const void __user * data)
+ static void *copy_mount_options(const void __user * data)
  {
  	char *copy;
 -	unsigned size;
 +	unsigned left, offset;
  
  	if (!data)
  		return NULL;