mm/huge_memory: remove enforce_sysfs from __thp_vma_allowable_orders

Using forced_collapse directly is clearer and enforce_sysfs is not really
needed.

Link: https://lkml.kernel.org/r/20250821150038.2025521-1-usamaarif642@gmail.com
Signed-off-by: Usama Arif <usamaarif642@gmail.com>
Acked-by: Zi Yan <ziy@nvidia.com>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: Dev Jain <dev.jain@arm.com>
Acked-by: David Hildenbrand <david@redhat.com>
Reviewed-by: SeongJae Park <sj@kernel.org>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Barry Song <baohua@kernel.org>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Mariano Pache <npache@redhat.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 2a47cd3bb649e36018840a742bb7bf39ae2f2e9f..26cedfcd74189444da3075f1b61357b583b55162 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -105,7 +105,6 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma,
        const bool smaps = type == TVA_SMAPS;
        const bool in_pf = type == TVA_PAGEFAULT;
        const bool forced_collapse = type == TVA_FORCED_COLLAPSE;
-       const bool enforce_sysfs = !forced_collapse;
        unsigned long supported_orders;
 
        /* Check the intersection of requested and supported orders. */
@@ -168,14 +167,14 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma,
        if (!in_pf && shmem_file(vma->vm_file))
                return orders & shmem_allowable_huge_orders(file_inode(vma->vm_file),
                                                   vma, vma->vm_pgoff, 0,
-                                                  !enforce_sysfs);
+                                                  forced_collapse);
 
        if (!vma_is_anonymous(vma)) {
                /*
-                * Enforce sysfs THP requirements as necessary. Anonymous vmas
+                * Enforce THP collapse requirements as necessary. Anonymous vmas
                 * were already handled in thp_vma_allowable_orders().
                 */
-               if (enforce_sysfs &&
+               if (!forced_collapse &&
                    (!hugepage_global_enabled() || (!(vm_flags & VM_HUGEPAGE) &&
                                                    !hugepage_global_always())))
                        return 0;