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, 15 insertions, 15 deletions

diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 6440003f8ddc..4d497e9c6883 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -282,7 +282,7 @@ void ufs_error (struct super_block * sb, const char * function,
                 usb1->fs_clean = UFS_FSBAD;
                 ubh_mark_buffer_dirty(USPI_UBH(uspi));
                 ufs_mark_sb_dirty(sb);
-                sb->s_flags |= MS_RDONLY;
+                sb->s_flags |= SB_RDONLY;
         }
         va_start(args, fmt);
         vaf.fmt = fmt;
@@ -320,7 +320,7 @@ void ufs_panic (struct super_block * sb, const char * function,
         va_start(args, fmt);
         vaf.fmt = fmt;
         vaf.va = &args;
-        sb->s_flags |= MS_RDONLY;
+        sb->s_flags |= SB_RDONLY;
         pr_crit("panic (device %s): %s: %pV\n",
                 sb->s_id, function, &vaf);
         va_end(args);
@@ -905,7 +905,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
                 if (!sb_rdonly(sb)) {
                         if (!silent)
                                 pr_info("ufstype=old is supported read-only\n");
-                        sb->s_flags |= MS_RDONLY;
+                        sb->s_flags |= SB_RDONLY;
                 }
                 break;
         
@@ -921,7 +921,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
                 if (!sb_rdonly(sb)) {
                         if (!silent)
                                 pr_info("ufstype=nextstep is supported read-only\n");
-                        sb->s_flags |= MS_RDONLY;
+                        sb->s_flags |= SB_RDONLY;
                 }
                 break;
         
@@ -937,7 +937,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
                 if (!sb_rdonly(sb)) {
                         if (!silent)
                                 pr_info("ufstype=nextstep-cd is supported read-only\n");
-                        sb->s_flags |= MS_RDONLY;
+                        sb->s_flags |= SB_RDONLY;
                 }
                 break;
         
@@ -953,7 +953,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
                 if (!sb_rdonly(sb)) {
                         if (!silent)
                                 pr_info("ufstype=openstep is supported read-only\n");
-                        sb->s_flags |= MS_RDONLY;
+                        sb->s_flags |= SB_RDONLY;
                 }
                 break;
         
@@ -968,7 +968,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
                 if (!sb_rdonly(sb)) {
                         if (!silent)
                                 pr_info("ufstype=hp is supported read-only\n");
-                        sb->s_flags |= MS_RDONLY;
+                        sb->s_flags |= SB_RDONLY;
                 }
                 break;
         default:
@@ -1125,21 +1125,21 @@ magic_found:
                         break;
                 case UFS_FSACTIVE:
                         pr_err("%s(): fs is active\n", __func__);
-                        sb->s_flags |= MS_RDONLY;
+                        sb->s_flags |= SB_RDONLY;
                         break;
                 case UFS_FSBAD:
                         pr_err("%s(): fs is bad\n", __func__);
-                        sb->s_flags |= MS_RDONLY;
+                        sb->s_flags |= SB_RDONLY;
                         break;
                 default:
                         pr_err("%s(): can't grok fs_clean 0x%x\n",
                                __func__, usb1->fs_clean);
-                        sb->s_flags |= MS_RDONLY;
+                        sb->s_flags |= SB_RDONLY;
                         break;
                 }
         } else {
                 pr_err("%s(): fs needs fsck\n", __func__);
-                sb->s_flags |= MS_RDONLY;
+                sb->s_flags |= SB_RDONLY;
         }
 
         /*
@@ -1328,7 +1328,7 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
                 return -EINVAL;
         }
 
-        if ((bool)(*mount_flags & MS_RDONLY) == sb_rdonly(sb)) {
+        if ((bool)(*mount_flags & SB_RDONLY) == sb_rdonly(sb)) {
                 UFS_SB(sb)->s_mount_opt = new_mount_opt;
                 mutex_unlock(&UFS_SB(sb)->s_lock);
                 return 0;
@@ -1337,7 +1337,7 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
         /*
          * fs was mouted as rw, remounting ro
          */
-        if (*mount_flags & MS_RDONLY) {
+        if (*mount_flags & SB_RDONLY) {
                 ufs_put_super_internal(sb);
                 usb1->fs_time = cpu_to_fs32(sb, get_seconds());
                 if ((flags & UFS_ST_MASK) == UFS_ST_SUN
@@ -1346,7 +1346,7 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
                         ufs_set_fs_state(sb, usb1, usb3,
                                 UFS_FSOK - fs32_to_cpu(sb, usb1->fs_time));
                 ubh_mark_buffer_dirty (USPI_UBH(uspi));
-                sb->s_flags |= MS_RDONLY;
+                sb->s_flags |= SB_RDONLY;
         } else {
         /*
          * fs was mounted as ro, remounting rw
@@ -1370,7 +1370,7 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
                         mutex_unlock(&UFS_SB(sb)->s_lock);
                         return -EPERM;
                 }
-                sb->s_flags &= ~MS_RDONLY;
+                sb->s_flags &= ~SB_RDONLY;
 #endif
         }
         UFS_SB(sb)->s_mount_opt = new_mount_opt;