aboutsummaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorToshi Kani <toshi.kani@hpe.com>2016-09-23 20:21:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-09-24 11:20:01 -0700
commit3089bf614c7e2fd441ee001e3ff3d18326f6f091 (patch)
treeb16cd2c7b0213c55dfe2d8b867e54745b403a861 /mm
parent3be7988674ab33565700a37b210f502563d932e6 (diff)
downloadlinux-stericsson-3089bf614c7e2fd441ee001e3ff3d18326f6f091.tar.gz
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>
Diffstat (limited to 'mm')
-rw-r--r--mm/shmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index fd8b2b5741b1..aec5b492d947 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -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;
}