Commit bc570c14 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2e90ca68 bf4498ad

mm/shmem.c

+0 −2
Original line number Diff line number Diff line
@@ -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 },

	{}

};