]> www.infradead.org Git - users/willy/xarray.git/commitdiff
mm: migrate_device: use a folio in migrate_device_range()
authorKefeng Wang <wangkefeng.wang@huawei.com>
Mon, 26 Aug 2024 06:58:10 +0000 (14:58 +0800)
committerAndrew Morton <akpm@linux-foundation.org>
Mon, 9 Sep 2024 23:38:58 +0000 (16:38 -0700)
Save two calls to compound_head() and use folio throughout.

Link: https://lkml.kernel.org/r/20240826065814.1336616-3-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Reviewed-by: Alistair Popple <apopple@nvidia.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/migrate_device.c

index 82d75205dda89a0da03ce4dfdc83e93bdd362300..66db28b89f9bbb1bf59613e450012476506e4177 100644 (file)
@@ -898,16 +898,17 @@ int migrate_device_range(unsigned long *src_pfns, unsigned long start,
        unsigned long i, pfn;
 
        for (pfn = start, i = 0; i < npages; pfn++, i++) {
-               struct page *page = pfn_to_page(pfn);
+               struct folio *folio;
 
-               if (!get_page_unless_zero(page)) {
+               folio = folio_get_nontail_page(pfn_to_page(pfn));
+               if (!folio) {
                        src_pfns[i] = 0;
                        continue;
                }
 
-               if (!trylock_page(page)) {
+               if (!folio_trylock(folio)) {
                        src_pfns[i] = 0;
-                       put_page(page);
+                       folio_put(folio);
                        continue;
                }