From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B739C197A0 for ; Fri, 17 Nov 2023 16:15:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E92E26B04FA; Fri, 17 Nov 2023 11:15:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E41046B04F9; Fri, 17 Nov 2023 11:15:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CBCA46B04FA; Fri, 17 Nov 2023 11:15:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B97766B04F7 for ; Fri, 17 Nov 2023 11:15:21 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 88D39140571 for ; Fri, 17 Nov 2023 16:15:21 +0000 (UTC) X-FDA: 81467946042.13.F7EC9B8 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf24.hostedemail.com (Postfix) with ESMTP id 85F7F180014 for ; Fri, 17 Nov 2023 16:15:19 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=eXvcsDQf; spf=none (imf24.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700237719; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=d2kHOzpOuXHwXRsMk1/dqyTvVthpU9cofZVkTm/4UCo=; b=tbsn6VFFS5nXGRMM2HnJ6TEcuGbfajrJtwsOJKq7na4yBpdQlXInHNCgYJQipUQrqGT52/ LziUccXwZgUgqGY0pXGq+E7z1LT/MHiRvJbBqy/8CNbpV2n0c6/xeDXggy7kTRNhOPo/FM ZJWUMcDyAVsEyd4nJEF6gMN/ttPI1N0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700237719; a=rsa-sha256; cv=none; b=bnxuXCQ5NwWA1AgRdh3BVVF4S4IA33YG9Gqv8j3/0pG6vdgx6JsizjJ10NLjUIfesmghN3 Lmi/+SuUTwUky0yuOx1DgNYFFIsNhYcSOq5Wg/e/5LAqto9/YLnV0xMYr/YVy4tnp/VB2z ajLpz/gZbLamLwRC+7TxMQyU9OGBuf0= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=eXvcsDQf; spf=none (imf24.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none 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=d2kHOzpOuXHwXRsMk1/dqyTvVthpU9cofZVkTm/4UCo=; b=eXvcsDQfEbE9m+fx+sPaMT6dVQ MU/QNu2vC2S3Mtrv/KKQxuyOHY5bQQXKyIvihXhZN9FRE5L8l+c/n/DM6QaT3iyoLVt3MYZ6ZAybo qdTOEVEkw2MrjPfZ2ltKr/jSKwRJl9LvCnzMYTN8PJXSZpUbTuGfEJyI2Oi4gV9O5WL9sLzrOUG5E s/t53XaeJp8uQGwS5j3IpKHmaVwy65XlvR+WckNOM1OVZcLkQOh3Y8/AGIb6EKTgBgW0UzJRtQs2L Hjj9sHkPaVDBYiK5Cfl9xCuPLPFwMtrj7aV0mGKzScoBPRZjbawb6L0P5v3ha3tPiQGSsdfD+Y8GJ gIRppf0w==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1r41Uc-00AKbJ-RK; Fri, 17 Nov 2023 16:14:54 +0000 From: "Matthew Wilcox (Oracle)" To: Naoya Horiguchi , Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 5/6] memory-failure: Convert truncate_error_page to truncate_error_folio Date: Fri, 17 Nov 2023 16:14:46 +0000 Message-Id: <20231117161447.2461643-6-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20231117161447.2461643-1-willy@infradead.org> References: <20231117161447.2461643-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: r7wuuh5s1y8b5idn6zz4cw8qtpjnydps X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 85F7F180014 X-Rspam-User: X-HE-Tag: 1700237719-310799 X-HE-Meta: U2FsdGVkX18ZW9m17uXoZ94MoyJhtd4rZV/eaB7tazbJPVGU68FrqVlZWhUDe4Qy2X5JytHA7f62BvXMjanNuaYPGFLNiXu4R9qinaPWo9At3+GyGS24s7D4Ca/pXxVEaOCtIBOcbeRoYQ94gWLlH9BPLVfiXl/t2E3NqgXnh8ds/R3/5f16tZRh/FiLT9F0PYNL0XdL5p490jPqQ9XlX2+HAHWLbuWGlPjEDgCwzYL/4jgzzt64EGkA+lh6xV3ARxJgM+Sp/LZh6/VafRGIvXbZXnXnyHhoyRFM2OXo9hf0eomDUWn+EKIb7tq4780lb/tA0EoXxN4gyV18YjXXTU/+AV6P9JX/haTm/D09TAW2YQla9D3dZLnqNrsys7w9ZEFg0o12MOewMQqkCFlw7heWYJCmOPm2LUx3FRjeICSuGtIrWopqK8Flt7qZsw8TdnY82HAv/EV1XK7tWi3Bd2hepopmW9YoNvrvha2JsKel2SH63824S4dN/cgrZ8o4BBVSDOhVpebtpJghUlJO5Lwggf+wMjCiJvac+aMF0E6iubN25MpfqMAIXs/cb4EUaXKKIvsuLOVKzM8/uyWG9vjGq/MxStcacWlX1cg7EThfERMRgevt1v2oD559k9WIxG/wB798JeXCUt6W8a2WdONpApnww7sJeLEBmQwgN8RgfTJsnzhcDiJcGjTqSTcj//IyWcbEAopFrOJO8BtNy5galwzt1d6RdBbkaQZhujmTPZfm368dv5EMzTqwkO+k847GlWYVw4bE6EG+KllR6uOLlqdUn/GaZuxnDf/YxBlrvM/VK9q3in+yhKnMCU52qekWLnZ4VF11q2H5T6zS8Uj3OvV1w2EPjYK2EKqQYIxs0QFytoc7nK8mzsRgwCK+XJFDKU6uhmW0u31m+iopdy7A6Plza1oH9BWa3brw7esLVTUaCn/+zt8zOdI/ZyRXBx/BNmLYt3k1NRowVha 1s6I9W6d gC4opIWBs7nKq2wRgeiE/WwRz0wrTt6Dovsi9XgZT0Mm7ipvKC0mTeJzBi9Y53trv2Bti0ZTre0L78jFDOm55oeShwSFs5x0Edfn9SZbgsKkKYVFPsp0qNa8eiH7WWwuq+JLEpV4PLoUzDPsTL3Rj3j6vobw5w0DVRO9NNMiD3QYtsKXJF3l64uZ5gdyPArO/Met9rsNfp34t6Zz0nSqA8qj4GXfgQBqqxVz0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Both callers now have a folio, so pass it in. Nothing downstream was expecting a tail page; that's asserted in generic_error_remove_page(), for example. Signed-off-by: Matthew Wilcox (Oracle) --- mm/memory-failure.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index d97d247c0224..6aec94821fda 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -927,14 +927,13 @@ static int delete_from_lru_cache(struct folio *folio) return -EIO; } -static int truncate_error_page(struct page *p, unsigned long pfn, +static int truncate_error_page(struct folio *folio, unsigned long pfn, struct address_space *mapping) { - struct folio *folio = page_folio(p); int ret = MF_FAILED; if (mapping->a_ops->error_remove_page) { - int err = mapping->a_ops->error_remove_page(mapping, p); + int err = mapping->a_ops->error_remove_page(mapping, &folio->page); if (err != 0) pr_info("%#lx: Failed to punch page: %d\n", pfn, err); @@ -1055,7 +1054,7 @@ static int me_pagecache_clean(struct page_state *ps, struct page *p) * * Open: to take i_rwsem or not for this? Right now we don't. */ - ret = truncate_error_page(p, page_to_pfn(p), mapping); + ret = truncate_error_page(folio, page_to_pfn(p), mapping); if (has_extra_refcount(ps, p, extra_pins)) ret = MF_FAILED; @@ -1189,7 +1188,7 @@ static int me_huge_page(struct page_state *ps, struct page *p) mapping = folio_mapping(folio); if (mapping) { - res = truncate_error_page(&folio->page, page_to_pfn(p), mapping); + res = truncate_error_page(folio, page_to_pfn(p), mapping); /* The page is kept in page cache. */ extra_pins = true; folio_unlock(folio); -- 2.42.0