Another chunk of fmount preparations from dhowells; only trivial conflicts for that part. It separates MS_... bits (very grotty mount(2) ABI) from the struct super_block ->s_flags (kernel-internal, only a small subset of MS_... stuff). This does *not* convert the filesystems to new constants; only the infrastructure is done here. The next step in that series is where the conflicts would be; that's the conversion of filesystems. It's purely mechanical and it's better done after the merge, so if you could run something like list=$(for i in MS_RDONLY MS_NOSUID MS_NODEV MS_NOEXEC MS_SYNCHRONOUS MS_MANDLOCK MS_DIRSYNC MS_NOATIME MS_NODIRATIME MS_SILENT MS_POSIXACL MS_KERNMOUNT MS_I_VERSION MS_LAZYTIME; do git grep -l $i fs drivers/staging/lustre drivers/mtd ipc mm include/linux; done|sort|uniq|grep -v '^fs/namespace.c$') sed -i -e 's/\<MS_RDONLY\>/SB_RDONLY/g' \ -e 's/\<MS_NOSUID\>/SB_NOSUID/g' \ -e 's/\<MS_NODEV\>/SB_NODEV/g' \ -e 's/\<MS_NOEXEC\>/SB_NOEXEC/g' \ -e 's/\<MS_SYNCHRONOUS\>/SB_SYNCHRONOUS/g' \ -e 's/\<MS_MANDLOCK\>/SB_MANDLOCK/g' \ -e 's/\<MS_DIRSYNC\>/SB_DIRSYNC/g' \ -e 's/\<MS_NOATIME\>/SB_NOATIME/g' \ -e 's/\<MS_NODIRATIME\>/SB_NODIRATIME/g' \ -e 's/\<MS_SILENT\>/SB_SILENT/g' \ -e 's/\<MS_POSIXACL\>/SB_POSIXACL/g' \ -e 's/\<MS_KERNMOUNT\>/SB_KERNMOUNT/g' \ -e 's/\<MS_I_VERSION\>/SB_I_VERSION/g' \ -e 's/\<MS_LAZYTIME\>/SB_LAZYTIME/g' \ $list and commit it with something along the lines of "convert filesystems away from use of MS_... constants" as commit message, it would save a quite a bit of headache next cycle... The following changes since commit 87b2c3fc63175bb32c96d4ec58152d4fdd5a4ae1: h8300: Add missing closing parenthesis in flat_get_addr_from_rp() (2017-07-16 09:24:06 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git work.mount for you to fetch changes up to e462ec50cb5fad19f6003a3d8087f4a0945dd2b1: VFS: Differentiate mount flags (MS_*) from internal superblock flags (2017-07-17 08:45:35 +0100) ---------------------------------------------------------------- David Howells (3): vfs: Add sb_rdonly(sb) to query the MS_RDONLY flag on s_flags VFS: Convert sb->s_flags & MS_RDONLY to sb_rdonly(sb) VFS: Differentiate mount flags (MS_*) from internal superblock flags Documentation/filesystems/porting | 2 +- drivers/staging/lustre/lustre/llite/llite_lib.c | 4 +- drivers/staging/lustre/lustre/llite/namei.c | 3 +- fs/affs/amigaffs.c | 2 +- fs/affs/bitmap.c | 2 +- fs/affs/super.c | 6 +- fs/befs/linuxvfs.c | 2 +- fs/btrfs/dev-replace.c | 2 +- fs/btrfs/disk-io.c | 12 ++-- fs/btrfs/extent_io.c | 4 +- fs/btrfs/inode.c | 2 +- fs/btrfs/ioctl.c | 2 +- fs/btrfs/root-tree.c | 2 +- fs/btrfs/super.c | 11 ++-- fs/btrfs/sysfs.c | 4 +- fs/btrfs/volumes.c | 4 +- fs/cachefiles/bind.c | 2 +- fs/ecryptfs/main.c | 3 +- fs/efs/super.c | 2 +- fs/ext2/super.c | 13 ++--- fs/ext4/ext4_jbd2.c | 2 +- fs/ext4/file.c | 2 +- fs/ext4/fsync.c | 2 +- fs/ext4/ialloc.c | 2 +- fs/ext4/mmp.c | 2 +- fs/ext4/super.c | 53 +++++++++--------- fs/fat/fatent.c | 2 +- fs/fat/inode.c | 4 +- fs/fat/misc.c | 2 +- fs/gfs2/glops.c | 2 +- fs/gfs2/ops_fstype.c | 4 +- fs/gfs2/quota.c | 2 +- fs/gfs2/recovery.c | 2 +- fs/gfs2/super.c | 4 +- fs/gfs2/sys.c | 2 +- fs/hfs/mdb.c | 6 +- fs/hfs/super.c | 4 +- fs/hfsplus/super.c | 10 ++-- fs/hpfs/alloc.c | 4 +- fs/hpfs/dir.c | 2 +- fs/hpfs/super.c | 13 ++--- fs/isofs/inode.c | 2 +- fs/jffs2/fs.c | 6 +- fs/jffs2/super.c | 2 +- fs/jffs2/wbuf.c | 4 +- fs/jfs/jfs_mount.c | 2 +- fs/jfs/super.c | 16 +++--- fs/minix/inode.c | 6 +- fs/namei.c | 3 +- fs/namespace.c | 62 +++++++++++---------- fs/nfs/super.c | 2 +- fs/nilfs2/inode.c | 4 +- fs/nilfs2/mdt.c | 2 +- fs/nilfs2/super.c | 19 +++---- fs/ntfs/super.c | 31 +++++------ fs/ocfs2/super.c | 15 ++--- fs/overlayfs/super.c | 2 +- fs/proc_namespace.c | 2 +- fs/quota/quota.c | 2 +- fs/reiserfs/inode.c | 2 +- fs/reiserfs/journal.c | 2 +- fs/reiserfs/prints.c | 2 +- fs/reiserfs/super.c | 18 +++--- fs/super.c | 74 ++++++++++++------------- fs/sync.c | 6 +- fs/sysv/balloc.c | 2 +- fs/sysv/ialloc.c | 2 +- fs/sysv/inode.c | 2 +- fs/sysv/super.c | 2 +- fs/ubifs/super.c | 2 +- fs/udf/super.c | 14 ++--- fs/ufs/super.c | 24 ++++---- fs/xfs/xfs_quotaops.c | 10 ++-- fs/xfs/xfs_super.c | 2 +- include/linux/fs.h | 48 ++++++++++++---- init/do_mounts.c | 6 +- 76 files changed, 314 insertions(+), 296 deletions(-)