@@ -55,29 +55,6 @@ static const struct constant_table common_clear_sb_flag[] = {
{ "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.
*/
@@ -85,11 +62,6 @@ int vfs_parse_sb_flag(struct fs_context *fc, struct fs_parameter *param)
{
const char *key = param->key;
unsigned int set, clear;
- unsigned int i;
-
- for (i = 0; i < ARRAY_SIZE(forbidden_sb_flag); i++)
- if (strcmp(key, forbidden_sb_flag[i]) == 0)
- return -EINVAL;
set = lookup_constant(common_set_sb_flag, key, 0);
clear = lookup_constant(common_clear_sb_flag, key, 0);
Impossible to keep this blacklist properly synced with what mount(8) parses and what it doesn't. E.g. it has various forms of "*atime" options, but not "atime"... Other than being impossible to maintain, it also makes little sense. So just get rid of it. Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> --- fs/fs_context.c | 28 ---------------------------- 1 file changed, 28 deletions(-)