Merge tag 'kconfig-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[linux-2.6-microblaze.git] / fs / fs_context.c

diff --git a/fs/fs_context.c b/fs/fs_context.c
index fc9f6ef..7d5c5dd 100644 (file)
--- a/fs/fs_context.c
+++ b/fs/fs_context.c
@@ -42,7 +42,6 @@ static const struct constant_table common_set_sb_flag[] = {
        { "dirsync",    SB_DIRSYNC },
        { "lazytime",   SB_LAZYTIME },
        { "mand",       SB_MANDLOCK },
-       { "posixacl",   SB_POSIXACL },
        { "ro",         SB_RDONLY },
        { "sync",       SB_SYNCHRONOUS },
        { },
@@ -53,44 +52,15 @@ static const struct constant_table common_clear_sb_flag[] = {
        { "nolazytime", SB_LAZYTIME },
        { "nomand",     SB_MANDLOCK },
        { "rw",         SB_RDONLY },
-       { "silent",     SB_SILENT },
        { },
 };
 
-static const char *const forbidden_sb_flag[] = {
-       "bind",
-       "dev",
-       "exec",
-       "move",
-       "noatime",
-       "nodev",
-       "nodiratime",
-       "noexec",
-       "norelatime",
-       "nostrictatime",
-       "nosuid",
-       "private",
-       "rec",
-       "relatime",
-       "remount",
-       "shared",
-       "slave",
-       "strictatime",
-       "suid",
-       "unbindable",
-};
-
 /*
  * Check for a common mount option that manipulates s_flags.
  */
 static int vfs_parse_sb_flag(struct fs_context *fc, const char *key)
 {
        unsigned int token;
-       unsigned int i;
-
-       for (i = 0; i < ARRAY_SIZE(forbidden_sb_flag); i++)
-               if (strcmp(key, forbidden_sb_flag[i]) == 0)
-                       return -EINVAL;
 
        token = lookup_constant(common_set_sb_flag, key, 0);
        if (token) {