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
This commit is contained in:
Linus Torvalds 2020-02-24 11:32:15 -08:00
Родитель 2e90ca68b0 bf4498ad3f
Коммит bc570c14b2
1 изменённых файлов: 0 добавлений и 2 удалений

Просмотреть файл

@ -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 },
{}
};