Commit 3089bf61 authored Sep 23, 2016 by Toshi Kani Committed by Linus Torvalds Sep 24, 2016

shmem: fix tmpfs to handle the huge= option properly



shmem_get_unmapped_area() checks SHMEM_SB(sb)->huge incorrectly, which
leads to a reversed effect of "huge=" mount option.

Fix the check in shmem_get_unmapped_area().

Note, the default value of SHMEM_SB(sb)->huge remains as
SHMEM_HUGE_NEVER.  User will need to specify "huge=" option to enable
huge page mappings.

Reported-by: Hillf Danton <hillf.zj@alibaba-inc.com>
Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 3be79886

mm/shmem.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1980,7 +1980,7 @@ unsigned long shmem_get_unmapped_area(struct file *file,
		return addr;
		sb = shm_mnt->mnt_sb;
		}
		if (SHMEM_SB(sb)->huge != SHMEM_HUGE_NEVER)
		if (SHMEM_SB(sb)->huge == SHMEM_HUGE_NEVER)
		return addr;
		}

Admin message