From patchwork Fri Jul 21 03:44:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13321291 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 BB7DBC0015E for ; Fri, 21 Jul 2023 03:45:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F3C1B28018A; Thu, 20 Jul 2023 23:45:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E750A280188; Thu, 20 Jul 2023 23:45:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D1642280189; Thu, 20 Jul 2023 23:45:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BDA10280187 for ; Thu, 20 Jul 2023 23:45:17 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 8B66280126 for ; Fri, 21 Jul 2023 03:45:17 +0000 (UTC) X-FDA: 81034228674.30.DF3AC99 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf10.hostedemail.com (Postfix) with ESMTP id 4DCBFC0006 for ; Fri, 21 Jul 2023 03:45:14 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; spf=pass (imf10.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689911115; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CB+qHE2AIiaz5vX2bP273n+UcyM/xFYJgaKztaFkiuE=; b=EkHtH8SAyeb+nTbBDUWfsCSl9y17Z6tgsIMZnc/tlXL6JBp1kHeY1TbTotN3OATFsxodaw SgFaPbGhbeUlYm2ne47w24ve8P9MEiJ4KgqmDnn4Dw/Iszw5Fd4PrxSmn2zLvjQ0t4Q7cu JS4vrbt3SbpgNbNasq34Ieua46MOIwc= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; spf=pass (imf10.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689911115; a=rsa-sha256; cv=none; b=1NGwudDS9WPIyi+6wpxQmi11u/0YLmaUAWzNrqnZXnbf8oFZ2chCundw/YfxVnEDRIpLcs 4H3neCD2W3e9OaqS2yT74LyNbd2636QXNHI/0Y32eskuOd3v5nHbtR6zIFg6NJoPDNQw7y 5IBK1dLhiejpNwbU9UM/bUeClATyFuQ= Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R6b2z22NLztRRT; Fri, 21 Jul 2023 11:42:03 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 21 Jul 2023 11:45:11 +0800 From: Peng Zhang To: , , CC: , , , , , ZhangPeng Subject: [PATCH v4 05/10] mm/page_io: use a folio in __end_swap_bio_read() Date: Fri, 21 Jul 2023 11:44:46 +0800 Message-ID: <20230721034451.16412-6-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230721034451.16412-1-zhangpeng362@huawei.com> References: <20230721034451.16412-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 4DCBFC0006 X-Rspam-User: X-Stat-Signature: ywoi8doubun3kuo8u6duexg6w15mzdgn X-Rspamd-Server: rspam01 X-HE-Tag: 1689911114-535157 X-HE-Meta: U2FsdGVkX1+7dXzvaMvx9kp6dsoF6AcZcO6okbhW8zrHwzjMohzNPGBVLCudjGJtmUyXLJdD0sI9G9dQUp0mSDsgdoFAR1knvLoRTDetwOmMAC7fi7QVe2jKxSLad1PhzXHM6a/vuC57cMJ6t7yourkpNdLZ+QTQ+C6ovE5tl14XrJAFjh3gRg1feSJl3oISdA3/eBLJZQPmyoT16ahxPDmhBf8WKV3PQ7+0vf4NiAYZ7i2v9wA4d4bVJ9IKILIu1XT5EF3rQ3FEkdX4DC11bbfMpK1K6pIwswek3jw6VcoBVfdLyvNlHGY4//bQ2C1aR48cr8EWoiAjQ60MNytvseMtYPhQqMNb7eC2HrMCnzEQ7H0aEcSaGPeywsu0zsqJ/psZI+XuPRmGQNKp3UnifM2vxK+QvIr7wB+7ssWLMjjb7FjAAR6bugtNoJ+Ji6I/Et6/7fjR0TrBQlkSAtCNe4Ed/E/ucrmChf/qaOiqe7pml7FmKaMOuJA38/NQGvqQ70+W0syu4U2KC2GVpDdWdZO2sy4W8kGyxjCbSThTy2zlQuE02ifF4UmiUaZoACVTvYgUeOFMKT5P/7YiCyuCC9aUrdXAZ6IXZbBBVpromgk1I3XF+zoGzY0OgkezT2UPObGl76wm0Br3wbvmWkcDOcgJYleisa/hcJQ2GPKJMX6hAIDmm2Xlp1PuOWnnEbZopB7aSVvqvNbAM2Gt/oDtVtHTLD7v9nyIZTgeHIkgSdsmNasboCXUhSfhwLs+swm0KjMly3dcer65C4h31/5Y5Iq2x1GfbYgmzpu6OzWeswEGyKiYViTUVtYCxKgpUYtI0bmSSPRZ/YX5SSYdGvwf3AwyABcKzIv6tnBt2BOudGrbiiP+QO3tZspi0qt+4lZNSWZtgl+Vy9Nw0RZ8nqqEOu7Lazkia1+MqnlHwcUOJ7kTh12rmuSvEbYVgsn6JzX+bDYw4M0coY/5uPC8mh4 DeVJNeF2 zuJ96LkQOQS7LAZ8DRMPS2Rc5Mwa2bkjglWouEhOdYIFBcI5eLo0Gyu01LMIECIzL/e1nGNXtZwuVu745b7VvD6XF0WDgYnempmtOgpFSkx6SDQXuMyPWZPRjsGXKNXyfRL7No3Ot/KN1p4xU5/e6zNF8YhxXTOQ9UFy3/WOjMU+EQMb8Iqx7ZILPMqxeMEeeZuxS 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: From: ZhangPeng Saves one implicit call to compound_head(). Signed-off-by: ZhangPeng --- mm/page_io.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index d9f5fa5b7281..3b97289153f9 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -57,16 +57,16 @@ static void end_swap_bio_write(struct bio *bio) static void __end_swap_bio_read(struct bio *bio) { - struct page *page = bio_first_page_all(bio); + struct folio *folio = bio_first_folio_all(bio); if (bio->bi_status) { pr_alert_ratelimited("Read-error on swap-device (%u:%u:%llu)\n", MAJOR(bio_dev(bio)), MINOR(bio_dev(bio)), (unsigned long long)bio->bi_iter.bi_sector); } else { - SetPageUptodate(page); + folio_mark_uptodate(folio); } - unlock_page(page); + folio_unlock(folio); } static void end_swap_bio_read(struct bio *bio)