• Linus Torvalds's avatar
    Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 0f0d1272
    Linus Torvalds authored
    Pull mount flag updates from Al Viro:
     "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' \
      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"
    * 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
      VFS: Differentiate mount flags (MS_*) from internal superblock flags
      VFS: Convert sb->s_flags & MS_RDONLY to sb_rdonly(sb)
      vfs: Add sb_rdonly(sb) to query the MS_RDONLY flag on s_flags