Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Jul 2017 19:00:42 +0000 (12:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Jul 2017 19:00:42 +0000 (12:00 -0700)
commit78dcf73421a879d22319d3889119945b85954a68
tree26e76f3e9fdc6b40133f2158de23cfe74af9feac
parent93ff81859733d9697a5a0cc4707e52fb17056abb
parentfdb254db21bb4aed44a0bc7fe993e58d3848c926
Merge branch 'work.mount' of git://git./linux/kernel/git/viro/vfs

Pull ->s_options removal from Al Viro:
 "Preparations for fsmount/fsopen stuff (coming next cycle). Everything
  gets moved to explicit ->show_options(), killing ->s_options off +
  some cosmetic bits around fs/namespace.c and friends. Basically, the
  stuff needed to work with fsmount series with minimum of conflicts
  with other work.

  It's not strictly required for this merge window, but it would reduce
  the PITA during the coming cycle, so it would be nice to have those
  bits and pieces out of the way"

* 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  isofs: Fix isofs_show_options()
  VFS: Kill off s_options and helpers
  orangefs: Implement show_options
  9p: Implement show_options
  isofs: Implement show_options
  afs: Implement show_options
  affs: Implement show_options
  befs: Implement show_options
  spufs: Implement show_options
  bpf: Implement show_options
  ramfs: Implement show_options
  pstore: Implement show_options
  omfs: Implement show_options
  hugetlbfs: Implement show_options
  VFS: Don't use save/replace_mount_options if not using generic_show_options
  VFS: Provide empty name qstr
  VFS: Make get_filesystem() return the affected filesystem
  VFS: Clean up whitespace in fs/namespace.c and fs/super.c
  Provide a function to create a NUL-terminated string from unterminated data
19 files changed:
Documentation/filesystems/vfs.txt
fs/afs/super.c
fs/btrfs/super.c
fs/dcache.c
fs/debugfs/inode.c
fs/filesystems.c
fs/gfs2/dir.c
fs/hugetlbfs/inode.c
fs/namei.c
fs/namespace.c
fs/pstore/inode.c
fs/pstore/internal.h
fs/pstore/platform.c
include/linux/dcache.h
include/linux/fs.h
include/linux/hugetlb.h
include/linux/string.h
mm/util.c
net/9p/trans_fd.c