Update two comments to refer to writeback in general instead of the specific flag. Convert the large comment in memory.c to be entirely folio-based. Signed-off-by: Matthew Wilcox (Oracle) --- mm/compaction.c | 2 +- mm/memory.c | 20 ++++++++++---------- mm/migrate.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 3648ce22c807..d607f6846e0d 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1123,7 +1123,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, * To minimise LRU disruption, the caller can indicate with * ISOLATE_ASYNC_MIGRATE that it only wants to isolate pages * it will be able to migrate without blocking - clean pages - * for the most part. PageWriteback would require blocking. + * for the most part. Writeback would require blocking. */ if ((mode & ISOLATE_ASYNC_MIGRATE) && folio_test_writeback(folio)) goto isolate_fail_put; diff --git a/mm/memory.c b/mm/memory.c index 86a973119bd4..37484bf3e934 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5451,18 +5451,18 @@ static vm_fault_t __do_fault(struct vm_fault *vmf) vm_fault_t ret; /* - * Preallocate pte before we take page_lock because this might lead to - * deadlocks for memcg reclaim which waits for pages under writeback: - * lock_page(A) - * SetPageWriteback(A) - * unlock_page(A) - * lock_page(B) - * lock_page(B) + * Preallocate pte before we take folio lock because this might lead to + * deadlocks for memcg reclaim which waits for folios under writeback: + * folio_lock(A) + * folio_set_writeback(A) + * folio_unlock(A) + * folio_lock(B) + * folio_lock(B) * pte_alloc_one * shrink_folio_list - * wait_on_page_writeback(A) - * SetPageWriteback(B) - * unlock_page(B) + * folio_wait_writeback(A) + * folio_set_writeback(B) + * folio_unlock(B) * # flush A, B to clear the writeback */ if (pmd_none(*vmf->pmd) && !vmf->prealloc_pte) { diff --git a/mm/migrate.c b/mm/migrate.c index 8a64291ab5b4..fedba0f1f0ef 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1258,7 +1258,7 @@ static int migrate_folio_unmap(new_folio_t get_new_folio, if (folio_test_writeback(src)) { /* * Only in the case of a full synchronous migration is it - * necessary to wait for PageWriteback. In the async case, + * necessary to wait for writeback. In the async case, * the retry loop is too short and in the sync-light case, * the overhead of stalling is too much */ -- 2.47.3