Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

…/viro/vfs Pull tmpfs fix from Al Viro: "Regression from fs_parse series this cycle..." * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: tmpfs: deny and force are not huge mount options
mariux64 · Feb 24, 2020 · bc570c1 · bc570c1
2 parents 2e90ca6 + bf4498a
commit bc570c1
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/mm/shmem.c b/mm/shmem.c
@@ -3386,8 +3386,6 @@ static const struct constant_table shmem_param_enums_huge[] = {
 	{"always",	SHMEM_HUGE_ALWAYS },
 	{"within_size",	SHMEM_HUGE_WITHIN_SIZE },
 	{"advise",	SHMEM_HUGE_ADVISE },
-	{"deny",	SHMEM_HUGE_DENY },
-	{"force",	SHMEM_HUGE_FORCE },
 	{}
 };