From: Hugh Dickins <hughd@google.com>
Date: Tue, 18 Feb 2020 04:04:19 +0000 (-0800)
Subject: tmpfs: deny and force are not huge mount options
X-Git-Tag: v5.10.7~3082^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf4498ad3f9a0f7202cf90e52b5ce9bb31700b91;p=platform%2Fkernel%2Flinux-rpi.git

tmpfs: deny and force are not huge mount options

5.6-rc1 commit 2710c957a8ef ("fs_parse: get rid of ->enums") regressed
the huge tmpfs mount options to an earlier state: "deny" and "force"
are not valid there, and can crash the kernel.  Delete those lines.

Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/mm/shmem.c b/mm/shmem.c
index c8f7540..aad3ba7 100644
--- 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 },
 	{}
 };