From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD13336E48C for ; Fri, 31 Jul 2026 20:08:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.155.50.34 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785528511; cv=none; b=Ivvg7lNBgwNh82mWH+3sad5Jr1auzrX6xRmAk4XrJgvBFE/Wu0Ml0SG3+L2NeXeOxV6TngX8SiEle20MjNiFJski92u90b1r1d+ZEL3GCR+YWVQg22XCazbY9B8YTPc2uTq2YQq6q1xeol2CCCr4/wxQVL+gDDykwqmfEJ1ceBY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785528511; c=relaxed/simple; bh=JJM0ef5YmyuW+xjDWBxRQR2DFYZHgBLZmcS/+I/dXAs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RRVhtqkmkZQBcW/2Fgbxg5D3eXhxYLNJgTFxdklIECDek3xuxOPCNGQe4nW6XoC3cGPvKr8HEJJIEfXy7c9G32q5WNr7VRdHyNivOk7CwZ92n6KpyyO5J1+W/aqQUHsXRoamELWQZtfFKLKdRX3xOaXg0+k2oQf2ilwwt0aK8Hg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=infradead.org; spf=pass smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=fw+l9rno; arc=none smtp.client-ip=90.155.50.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="fw+l9rno" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=hIzJYRQZPpHEWuu6W/AISPT7gNqOr/DEAar1Fg4H3OU=; b=fw+l9rnokR1JrAunKCwKK1qypD NpXEnItcaTxMD173aSHPmeiQ61ukkYe54RoPsTvAi5kpxWIid8y2voyY+4+/BHGBg99YfqUfpjQ1T 9m/Bm4GoEcWLPS5Uwvw7k3uySov3aKmF47uhHd8S4mc9dcMRqB1qWJP1UgivEhJy/N0gdKMxYCyrT NMy0L2lWu030gifCcfxDfUxgH/ej5mlYVHWhLwfJnsxTfAT+EOS6lCs5xZkDOWwjKGb4L3XiUb3iQ orWTKu8guUAGqN0ZJpgfUU4xoulahiz3Qn+cOIw76rNpRs1T4Rs+btzo7dsheWUeb7BX7cSScMgez fxwpO7Ng==; Received: from willy by casper.infradead.org with local (Exim 4.99.1 #2 (Red Hat Linux)) id 1wptWW-00000002Pfr-11Ya; Fri, 31 Jul 2026 20:08:04 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton , Jane Chu , linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , Muchun Song , Oscar Salvador , David Hildenbrand , Miaohe Lin , Naoya Horiguchi , Jan Kara , linux-fsdevel@vger.kernel.org, Christian Brauner , Jiaqi Yan , Usama Arif , Gregory Price Subject: [PATCH v8 03/15] mm: Rename folio_contain_hwpoison_page() to folio_has_hwpoison_page() Date: Fri, 31 Jul 2026 21:07:48 +0100 Message-ID: <20260731200802.574821-4-willy@infradead.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260731200802.574821-1-willy@infradead.org> References: <20260731200802.574821-1-willy@infradead.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This is a better name for this predicate. Also make the argument const to allow other callers to be made const. No functional change. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Usama Arif Reviewed-by: Gregory Price Reviewed-by: Miaohe Lin Reviewed-by: Jane Chu --- include/linux/page-flags.h | 4 ++-- mm/huge_memory.c | 2 +- mm/memory_hotplug.c | 2 +- mm/shmem.c | 2 +- mm/vmscan.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 7223f6f4e2b4..4185a03a45cf 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -1083,10 +1083,10 @@ static inline bool is_page_hwpoison(const struct page *page) return folio_test_hugetlb(folio) && PageHWPoison(&folio->page); } -static inline bool folio_contain_hwpoisoned_page(struct folio *folio) +static inline bool folio_has_hwpoisoned_page(const struct folio *folio) { return folio_test_hwpoison(folio) || - (folio_test_large(folio) && folio_test_has_hwpoisoned(folio)); + (folio_test_large(folio) && folio_test_has_hwpoisoned(folio)); } bool is_free_buddy_page(const struct page *page); diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 2bccb0a53a0a..353340309107 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -4413,7 +4413,7 @@ static bool thp_underused(struct folio *folio) if (khugepaged_max_ptes_none == HPAGE_PMD_NR - 1) return false; - if (folio_contain_hwpoisoned_page(folio)) + if (folio_has_hwpoisoned_page(folio)) return false; for (i = 0; i < folio_nr_pages(folio); i++) { diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 7ac19fab2263..33007e8e546a 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1813,7 +1813,7 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) if (folio_test_large(folio)) pfn = folio_pfn(folio) + folio_nr_pages(folio) - 1; - if (folio_contain_hwpoisoned_page(folio)) { + if (folio_has_hwpoisoned_page(folio)) { /* * unmap_poisoned_folio() cannot handle large folios * in all cases yet. diff --git a/mm/shmem.c b/mm/shmem.c index b51f83c970bb..492c9bef3620 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3240,7 +3240,7 @@ shmem_write_begin(const struct kiocb *iocb, struct address_space *mapping, if (ret) return ret; - if (folio_contain_hwpoisoned_page(folio)) { + if (folio_has_hwpoisoned_page(folio)) { folio_unlock(folio); folio_put(folio); return -EIO; diff --git a/mm/vmscan.c b/mm/vmscan.c index 35c3bb15ae96..70e54ace0e74 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1086,7 +1086,7 @@ static unsigned int shrink_folio_list(struct list_head *folio_list, if (!folio_trylock(folio)) goto keep; - if (folio_contain_hwpoisoned_page(folio)) { + if (folio_has_hwpoisoned_page(folio)) { /* * unmap_poisoned_folio() can't handle large * folio, just skip it. memory_failure() will -- 2.47.3