summaryrefslogtreecommitdiffstats
path: root/fs/befs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-27 16:05:09 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-27 16:05:09 -0500
commit1751e8a6cb935e555fcdbcb9ab4f0446e322ca3e (patch)
tree83c57e4aeda0665cb131de862364b7a5cfd7dd66 /fs/befs
parent141cbfba1d0502006463aa80f57c64086226af1a (diff)
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>
Diffstat (limited to 'fs/befs')
-rw-r--r--fs/befs/ChangeLog2
-rw-r--r--fs/befs/linuxvfs.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/befs/ChangeLog b/fs/befs/ChangeLog
index 75a461cfaca6..16f2dfe8c2f7 100644
--- a/fs/befs/ChangeLog
+++ b/fs/befs/ChangeLog
@@ -365,7 +365,7 @@ Version 0.4 (2001-10-28)
365 (fs/befs/super.c) 365 (fs/befs/super.c)
366 366
367* Tell the kernel to only mount befs read-only. 367* Tell the kernel to only mount befs read-only.
368 By setting the MS_RDONLY flag in befs_read_super(). 368 By setting the SB_RDONLY flag in befs_read_super().
369 Not that it was possible to write before. But now the kernel won't even try. 369 Not that it was possible to write before. But now the kernel won't even try.
370 (fs/befs/super.c) 370 (fs/befs/super.c)
371 371
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index a92355cc453b..ee236231cafa 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -841,7 +841,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
841 if (!sb_rdonly(sb)) { 841 if (!sb_rdonly(sb)) {
842 befs_warning(sb, 842 befs_warning(sb,
843 "No write support. Marking filesystem read-only"); 843 "No write support. Marking filesystem read-only");
844 sb->s_flags |= MS_RDONLY; 844 sb->s_flags |= SB_RDONLY;
845 } 845 }
846 846
847 /* 847 /*
@@ -948,7 +948,7 @@ static int
948befs_remount(struct super_block *sb, int *flags, char *data) 948befs_remount(struct super_block *sb, int *flags, char *data)
949{ 949{
950 sync_filesystem(sb); 950 sync_filesystem(sb);
951 if (!(*flags & MS_RDONLY)) 951 if (!(*flags & SB_RDONLY))
952 return -EINVAL; 952 return -EINVAL;
953 return 0; 953 return 0;
954} 954}