tmpfs: deny and force are not huge mount options
authorHugh Dickins <hughd@google.com>
Tue, 18 Feb 2020 04:04:19 +0000 (20:04 -0800)
committerAl Viro <viro@zeniv.linux.org.uk>
Tue, 18 Feb 2020 20:07:30 +0000 (15:07 -0500)
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>
mm/shmem.c

index c8f7540ef048ebc5b425ed640999acf361819cd7..aad3ba74b0e9d121bd774e795460d5f2f73ac119 100644 (file)
@@ -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 },
        {}
 };