From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 May 2019 03:17:51 +0000 (-0700)
Subject: Merge branch 'work.mount-syscalls' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~6439
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=400913252d09f9cfb8cce33daee43167921fc343;p=mirror_ubuntu-kernels.git

Merge branch 'work.mount-syscalls' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull mount ABI updates from Al Viro:
 "The syscalls themselves, finally.

  That's not all there is to that stuff, but switching individual
  filesystems to new methods is fortunately independent from everything
  else, so e.g. NFS series can go through NFS tree, etc.

  As those conversions get done, we'll be finally able to get rid of a
  bunch of duplication in fs/super.c introduced in the beginning of the
  entire thing. I expect that to be finished in the next window..."

* 'work.mount-syscalls' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: Add a sample program for the new mount API
  vfs: syscall: Add fspick() to select a superblock for reconfiguration
  vfs: syscall: Add fsmount() to create a mount for a superblock
  vfs: syscall: Add fsconfig() for configuring and managing a context
  vfs: Implement logging through fs_context
  vfs: syscall: Add fsopen() to prepare for superblock creation
  Make anon_inodes unconditional
  teach move_mount(2) to work with OPEN_TREE_CLONE
  vfs: syscall: Add move_mount(2) to move mounts around
  vfs: syscall: Add open_tree(2) to reference or clone a mount
---

400913252d09f9cfb8cce33daee43167921fc343
diff --cc fs/internal.h
index 17a8ae967493,95cf7b0af21f..0010889f2e85
--- a/fs/internal.h
+++ b/fs/internal.h
@@@ -89,9 -92,12 +92,10 @@@ extern int sb_prepare_remount_readonly(
  
  extern void __init mnt_init(void);
  
 -extern int __mnt_want_write(struct vfsmount *);
  extern int __mnt_want_write_file(struct file *);
 -extern void __mnt_drop_write(struct vfsmount *);
  extern void __mnt_drop_write_file(struct file *);
  
+ extern void dissolve_on_fput(struct vfsmount *);
  /*
   * fs_struct.c
   */
diff --cc samples/Makefile
index fadadb1c3b05,95d71ffd62d5..2484cc262d3e
--- a/samples/Makefile
+++ b/samples/Makefile
@@@ -3,4 -3,4 +3,4 @@@
  obj-$(CONFIG_SAMPLES)	+= kobject/ kprobes/ trace_events/ livepatch/ \
  			   hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
  			   configfs/ connector/ v4l/ trace_printk/ \
- 			   vfio-mdev/ statx/ qmi/ binderfs/ pidfd/
 -			   vfio-mdev/ vfs/ qmi/ binderfs/
++			   vfio-mdev/ vfs/ qmi/ binderfs/ pidfd/