]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mm/memory-failure: save some page_folio() calls
authorMiaohe Lin <linmiaohe@huawei.com>
Wed, 12 Jun 2024 07:18:26 +0000 (15:18 +0800)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 4 Jul 2024 02:30:10 +0000 (19:30 -0700)
Use local variable folio directly to save a page_folio() call.  Also use
folio_mapped() to save more page_folio() calls.  No functional change
intended.

Link: https://lkml.kernel.org/r/20240612071835.157004-5-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Cc: kernel test robot <lkp@intel.com>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/memory-failure.c

index 958b17a4b0f5152c9cb7ae16e534cbe84f164221..470c570d779c03977d0129c165878d9ce78986bc 100644 (file)
@@ -1575,7 +1575,7 @@ static bool hwpoison_user_mappings(struct folio *folio, struct page *p,
         * This check implies we don't kill processes if their pages
         * are in the swap cache early. Those are always late kills.
         */
-       if (!page_mapped(p))
+       if (!folio_mapped(folio))
                return true;
 
        if (folio_test_swapcache(folio)) {
@@ -1626,10 +1626,10 @@ static bool hwpoison_user_mappings(struct folio *folio, struct page *p,
                try_to_unmap(folio, ttu);
        }
 
-       unmap_success = !page_mapped(p);
+       unmap_success = !folio_mapped(folio);
        if (!unmap_success)
                pr_err("%#lx: failed to unmap page (folio mapcount=%d)\n",
-                      pfn, folio_mapcount(page_folio(p)));
+                      pfn, folio_mapcount(folio));
 
        /*
         * try_to_unmap() might put mlocked page in lru cache, so call