Rename superblock flags (MS_xyz -> SB_xyz)

This is a pure automated search-and-replace of the internal kernel
superblock flags.

The s_flags are now called SB_*, with the names and the values for the
moment mirroring the MS_* flags that they're equivalent to.

Note how the MS_xyz flags are the ones passed to the mount system call,
while the SB_xyz flags are what we then use in sb->s_flags.

The script to do this was:

    # places to look in; re security/*: it generally should *not* be
    # touched (that stuff parses mount(2) arguments directly), but
    # there are two places where we really deal with superblock flags.
    FILES="drivers/mtd drivers/staging/lustre fs ipc mm \
            include/linux/fs.h include/uapi/linux/bfs_fs.h \
            security/apparmor/apparmorfs.c security/apparmor/include/lib.h"
    # the list of MS_... constants
    SYMS="RDONLY NOSUID NODEV NOEXEC SYNCHRONOUS REMOUNT MANDLOCK \
          DIRSYNC NOATIME NODIRATIME BIND MOVE REC VERBOSE SILENT \
          POSIXACL UNBINDABLE PRIVATE SLAVE SHARED RELATIME KERNMOUNT \
          I_VERSION STRICTATIME LAZYTIME SUBMOUNT NOREMOTELOCK NOSEC BORN \
          ACTIVE NOUSER"

    SED_PROG=
    for i in $SYMS; do SED_PROG="$SED_PROG -e s/MS_$i/SB_$i/g"; done

    # we want files that contain at least one of MS_...,
    # with fs/namespace.c and fs/pnode.c excluded.
    L=$(for i in $SYMS; do git grep -w -l MS_$i $FILES; done| sort|uniq|grep -v '^fs/namespace.c'|grep -v '^fs/pnode.c')

    for f in $L; do sed -i $f $SED_PROG; done

Requested-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/fs/affs/super.c b/fs/affs/super.c
index 884bedab7266..1117e36134cc 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -356,7 +356,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
 
         sb->s_magic             = AFFS_SUPER_MAGIC;
         sb->s_op                = &affs_sops;
-        sb->s_flags |= MS_NODIRATIME;
+        sb->s_flags |= SB_NODIRATIME;
 
         sbi = kzalloc(sizeof(struct affs_sb_info), GFP_KERNEL);
         if (!sbi)
@@ -466,7 +466,7 @@ got_root:
         if ((chksum == FS_DCFFS || chksum == MUFS_DCFFS || chksum == FS_DCOFS
              || chksum == MUFS_DCOFS) && !sb_rdonly(sb)) {
                 pr_notice("Dircache FS - mounting %s read only\n", sb->s_id);
-                sb->s_flags |= MS_RDONLY;
+                sb->s_flags |= SB_RDONLY;
         }
         switch (chksum) {
         case MUFS_FS:
@@ -488,7 +488,7 @@ got_root:
                 /* fall thru */
         case FS_OFS:
                 affs_set_opt(sbi->s_flags, SF_OFS);
-                sb->s_flags |= MS_NOEXEC;
+                sb->s_flags |= SB_NOEXEC;
                 break;
         case MUFS_DCOFS:
         case MUFS_INTLOFS:
@@ -497,7 +497,7 @@ got_root:
         case FS_INTLOFS:
                 affs_set_opt(sbi->s_flags, SF_INTL);
                 affs_set_opt(sbi->s_flags, SF_OFS);
-                sb->s_flags |= MS_NOEXEC;
+                sb->s_flags |= SB_NOEXEC;
                 break;
         default:
                 pr_err("Unknown filesystem on device %s: %08X\n",
@@ -513,7 +513,7 @@ got_root:
                         sig, sig[3] + '0', blocksize);
         }
 
-        sb->s_flags |= MS_NODEV | MS_NOSUID;
+        sb->s_flags |= SB_NODEV | SB_NOSUID;
 
         sbi->s_data_blksize = sb->s_blocksize;
         if (affs_test_opt(sbi->s_flags, SF_OFS))
@@ -570,7 +570,7 @@ affs_remount(struct super_block *sb, int *flags, char *data)
         pr_debug("%s(flags=0x%x,opts=\"%s\")\n", __func__, *flags, data);
 
         sync_filesystem(sb);
-        *flags |= MS_NODIRATIME;
+        *flags |= SB_NODIRATIME;
 
         memcpy(volume, sbi->s_volume, 32);
         if (!parse_options(data, &uid, &gid, &mode, &reserved, &root_block,
@@ -596,10 +596,10 @@ affs_remount(struct super_block *sb, int *flags, char *data)
         memcpy(sbi->s_volume, volume, 32);
         spin_unlock(&sbi->symlink_lock);
 
-        if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
+        if ((bool)(*flags & SB_RDONLY) == sb_rdonly(sb))
                 return 0;
 
-        if (*flags & MS_RDONLY)
+        if (*flags & SB_RDONLY)
                 affs_free_bitmap(sb);
         else
                 res = affs_init_bitmap(sb, flags);