Replace the remaining uses of the legacy vm_flags_t flags in the rmap logic with vma_flags_t values. No functional change intended. Signed-off-by: Lorenzo Stoakes (ARM) --- mm/rmap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 1131b76bbbc2..cdc97fec8586 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1196,7 +1196,7 @@ static bool page_mkclean_one(struct folio *folio, struct vm_area_struct *vma, static bool invalid_mkclean_vma(struct vm_area_struct *vma, void *arg) { - if (vma->vm_flags & VM_SHARED) + if (vma_test(vma, VMA_SHARED_BIT)) return false; return true; @@ -1660,7 +1660,8 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, * VM_DROPPABLE mappings don't swap; instead they're just dropped when * under memory pressure. */ - if (!folio_test_swapbacked(folio) && !(vma->vm_flags & VM_DROPPABLE)) + if (!folio_test_swapbacked(folio) && + !vma_test_single_mask(vma, VMA_DROPPABLE)) __folio_set_swapbacked(folio); __folio_set_anon(folio, vma, address, exclusive); @@ -2094,7 +2095,8 @@ static bool ttu_anon_lazyfree_folio(struct vm_area_struct *vma, */ smp_rmb(); - if (folio_test_dirty(folio) && !(vma->vm_flags & VM_DROPPABLE)) { + if (folio_test_dirty(folio) && + !vma_test_single_mask(vma, VMA_DROPPABLE)) { /* * redirtied either using the page table or a previously * obtained GUP reference. -- 2.56.0