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

diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index e5bb2de2262a..1d458b716957 100644
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -329,9 +329,9 @@ static int hfsplus_statfs(struct dentry *dentry, struct kstatfs *buf)
 static int hfsplus_remount(struct super_block *sb, int *flags, char *data)
 {
         sync_filesystem(sb);
-        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)) {
                 struct hfsplus_vh *vhdr = HFSPLUS_SB(sb)->s_vhdr;
                 int force = 0;
 
@@ -340,20 +340,20 @@ static int hfsplus_remount(struct super_block *sb, int *flags, char *data)
 
                 if (!(vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_UNMNT))) {
                         pr_warn("filesystem was not cleanly unmounted, running fsck.hfsplus is recommended.  leaving read-only.\n");
-                        sb->s_flags |= MS_RDONLY;
-                        *flags |= MS_RDONLY;
+                        sb->s_flags |= SB_RDONLY;
+                        *flags |= SB_RDONLY;
                 } else if (force) {
                         /* nothing */
                 } else if (vhdr->attributes &
                                 cpu_to_be32(HFSPLUS_VOL_SOFTLOCK)) {
                         pr_warn("filesystem is marked locked, leaving read-only.\n");
-                        sb->s_flags |= MS_RDONLY;
-                        *flags |= MS_RDONLY;
+                        sb->s_flags |= SB_RDONLY;
+                        *flags |= SB_RDONLY;
                 } else if (vhdr->attributes &
                                 cpu_to_be32(HFSPLUS_VOL_JOURNALED)) {
                         pr_warn("filesystem is marked journaled, leaving read-only.\n");
-                        sb->s_flags |= MS_RDONLY;
-                        *flags |= MS_RDONLY;
+                        sb->s_flags |= SB_RDONLY;
+                        *flags |= SB_RDONLY;
                 }
         }
         return 0;
@@ -455,16 +455,16 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
 
         if (!(vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_UNMNT))) {
                 pr_warn("Filesystem was not cleanly unmounted, running fsck.hfsplus is recommended.  mounting read-only.\n");
-                sb->s_flags |= MS_RDONLY;
+                sb->s_flags |= SB_RDONLY;
         } else if (test_and_clear_bit(HFSPLUS_SB_FORCE, &sbi->flags)) {
                 /* nothing */
         } else if (vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_SOFTLOCK)) {
                 pr_warn("Filesystem is marked locked, mounting read-only.\n");
-                sb->s_flags |= MS_RDONLY;
+                sb->s_flags |= SB_RDONLY;
         } else if ((vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_JOURNALED)) &&
                         !sb_rdonly(sb)) {
                 pr_warn("write access to a journaled filesystem is not supported, use the force option at your own risk, mounting read-only.\n");
-                sb->s_flags |= MS_RDONLY;
+                sb->s_flags |= SB_RDONLY;
         }
 
         err = -EINVAL;