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 1C072C43217 for ; Fri, 18 Nov 2022 07:31:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB2608E0003; Fri, 18 Nov 2022 02:31:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C5718E0001; Fri, 18 Nov 2022 02:31:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 866778E0003; Fri, 18 Nov 2022 02:31:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 774748E0001 for ; Fri, 18 Nov 2022 02:31:05 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 52C734126D for ; Fri, 18 Nov 2022 07:31:05 +0000 (UTC) X-FDA: 80145741690.12.18D2FF9 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf02.hostedemail.com (Postfix) with ESMTP id 048D680012 for ; Fri, 18 Nov 2022 07:31:03 +0000 (UTC) Received: by mail-pj1-f44.google.com with SMTP id k5so3773667pjo.5 for ; Thu, 17 Nov 2022 23:31:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Wss4l8+ki3bcqZpf4pXWKdXS9Ah4/Shxx0wHVdp0ynM=; b=ckE22BdRtTbcTpcAczDBDx142TEzFlzwaz45MGFZZgwWkx2w7J9ONyEK1YVTBtjfR6 RqbV2slZHKwdlqMT3lnVqoWGcRGASMPNbRG0a2ZrIDEaqZNX3aw9GppTxZWNyx6UaYyq /ZXWxeUL/0Ezt57Yz21sJQrooj599j6KBMdv/q/RYuFFdCIM4Yqt2Xr0oLGb5vXXsPOg r6eaZJ/pKRNO2dyZ4Bd5ISXKU7nzL84AoEDMUBU7Gw51pMl98qYM2mFUepjU9gkvOFX3 XxF7OVdMMEoAcAvgYU0CPiRt9xKcZFhO4Bnpn6/jj0RbAutl40YuQiuwkUsz0eBDueq8 YxHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Wss4l8+ki3bcqZpf4pXWKdXS9Ah4/Shxx0wHVdp0ynM=; b=azsLo9NCtJ1DvHYaavU41TylZSY0asqDIM70vHlCifAYGwA+h4InRtIMXBf5tq/45P xa55n1m44qybXlojJkRGhGxioqS+PxGZP5PUwRbWDfgPwgdjJxJINL0d8Xxd/Ln/1eFn ZtVaxAysr3bvqFz1XFYvS0WvOdDitlR4zUj5KCJfemuas9RS/xwf5X64ZzsEKe4xtVIZ my7qOFwXsCgtsBiJsnFSTEn0/bgjKXaChAEoxyU/AneMAmCy2HiDJUYFOCRhveYBtlc2 wuzHzv8SJeoTwISlgEnCj9TMhDr4sZx3/HzRjhKpgV0m/Tw3v+2M/pj2cbfCXwEKTPFy E3Zg== X-Gm-Message-State: ANoB5pnlZyo/WIrLAyu+MXBn1eEHl3ZmNbbAoYoFzYPvSn7AwgMUiLsa XglzBZHAERzB0LrGzXsCIpm0+aQFhGk5zA== X-Google-Smtp-Source: AA0mqf5rq6PJFQI1QyEafiKw6xrOHDycZs2gbfK12hDo+brU69QumLv0AmatzvvNoW9m3BJjhDEi/Q== X-Received: by 2002:a17:902:c141:b0:186:c958:64f with SMTP id 1-20020a170902c14100b00186c958064fmr6370295plj.33.1668756662876; Thu, 17 Nov 2022 23:31:02 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::2c6b]) by smtp.googlemail.com with ESMTPSA id f7-20020a625107000000b0056b818142a2sm2424325pfb.109.2022.11.17.23.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 23:31:02 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org, akpm@linux-foundation.org, willy@infradead.org, naoya.horiguchi@nec.com, tytso@mit.edu, "Vishal Moola (Oracle)" Subject: [PATCH v3 3/4] memory-failure: Convert truncate_error_page() to use folio Date: Thu, 17 Nov 2022 23:30:54 -0800 Message-Id: <20221118073055.55694-4-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221118073055.55694-1-vishal.moola@gmail.com> References: <20221118073055.55694-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668756664; a=rsa-sha256; cv=none; b=wfQob2fgQb7XIdhYU82DtwZ4lxtE1TgDHWksOF1eZGBlMGOaNkYbkB5PNVTOu+S4NdLVPN 2DgBVtyFiLQQH0/wbjz6zau2PZ2VEcbsbaWh/oJGeuOvq6JhrnWAVAj8Pb4WvgQD5PcpRM /EVC7HAcZLYzYBkc73bwyYV870izJP0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=ckE22BdR; spf=pass (imf02.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1668756664; 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=Wss4l8+ki3bcqZpf4pXWKdXS9Ah4/Shxx0wHVdp0ynM=; b=UhN5L7WZVfUai4qAWtCT1JJnVxo//ExI9uJe0wAczPD9Dg9zCChMi4s/JHYenUapx1+yEf vNUT4t4io5cS0KOVupi36Olx7Ie6YlKkVCivQV/wiN+iObVc21BCPC3jJGkaBVv/9RYWdq VRnC3jEA9WGCsEmg0JWN/BYNE/EFhXE= X-Stat-Signature: ynxhx1i5jh75wnonkcmi51mhgtm3i5h9 X-Rspamd-Queue-Id: 048D680012 Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=ckE22BdR; spf=pass (imf02.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1668756663-394150 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: Replaces try_to_release_page() with filemap_release_folio(). This change is in preparation for the removal of the try_to_release_page() wrapper. Signed-off-by: Vishal Moola (Oracle) Acked-by: Naoya Horiguchi --- mm/memory-failure.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 145bb561ddb3..92ec9b0e58a3 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -827,12 +827,13 @@ static int truncate_error_page(struct page *p, unsigned long pfn, int ret = MF_FAILED; if (mapping->a_ops->error_remove_page) { + struct folio *folio = page_folio(p); int err = mapping->a_ops->error_remove_page(mapping, p); if (err != 0) { pr_info("%#lx: Failed to punch page: %d\n", pfn, err); - } else if (page_has_private(p) && - !try_to_release_page(p, GFP_NOIO)) { + } else if (folio_has_private(folio) && + !filemap_release_folio(folio, GFP_NOIO)) { pr_info("%#lx: failed to release buffers\n", pfn); } else { ret = MF_RECOVERED; -- 2.38.1