mm/shmem: restore SHMEM_HUGE_DENY precedence over MADV_COLLAPSE

[sfrench/cifs-2.6.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index c301487be5fb405d2f2d12a9c497e951dbecdbe3..0005ab2c29af7bc3241bd50514036c2cdbf7a82b 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -478,12 +478,10 @@ bool shmem_is_huge(struct vm_area_struct *vma, struct inode *inode,
        if (vma && ((vma->vm_flags & VM_NOHUGEPAGE) ||
            test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags)))
                return false;
-       if (shmem_huge_force)
-               return true;
-       if (shmem_huge == SHMEM_HUGE_FORCE)
-               return true;
        if (shmem_huge == SHMEM_HUGE_DENY)
                return false;
+       if (shmem_huge_force || shmem_huge == SHMEM_HUGE_FORCE)
+               return true;
 
        switch (SHMEM_SB(inode->i_sb)->huge) {
        case SHMEM_HUGE_ALWAYS: