From patchwork Fri Jul 21 03:44:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13321294 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 3A81CC001DE for ; Fri, 21 Jul 2023 03:45:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9A3C5280187; Thu, 20 Jul 2023 23:45:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 46419280189; Thu, 20 Jul 2023 23:45:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A4B028018C; Thu, 20 Jul 2023 23:45:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id EFE1D28004C for ; Thu, 20 Jul 2023 23:45:17 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id BB72614011F for ; Fri, 21 Jul 2023 03:45:17 +0000 (UTC) X-FDA: 81034228674.23.8F3A347 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf09.hostedemail.com (Postfix) with ESMTP id 841FD140009 for ; Fri, 21 Jul 2023 03:45:15 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; spf=pass (imf09.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=1689911116; 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=UIF1/RDQxGiWQWtgFqv/0f1S/VSRVZSzWjrR6f+CKz4=; b=bsurHHTWEqPpW4ZGgPXoyl7JTcHqlPrNM8saPGIUApMddQ0bw3FaSoMLpt41FVXKmYtm6g I0GCC2NtZtN6SgQptIMB2S2NNYCYaJ9nJGSzJd4HrqSg+zNIawXldnu1oAjcb8wsnx0KDj Nkpbab8i/j5OZhWKLPOPZz/z1dozl2k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689911116; a=rsa-sha256; cv=none; b=VvBtm+nY7pjIbtZd6T7/E/CMMeYiYTO+/dV1M0tahwQMixPA5P/Mhc+22tKd0KxQlbGRSH 4IaEvYn8perjSy96Trk7tM6MrWP0UPU/i/DhxZ4nqy748RRPht1i1v+YYAhBD5KuMXZnj0 K6X+UzE1eTf/fo9qLZtnks4uOYQaZmA= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; spf=pass (imf09.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 Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R6b5j6SfrzrRqs; Fri, 21 Jul 2023 11:44:25 +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 06/10] mm/page_io: use a folio in sio_read_complete() Date: Fri, 21 Jul 2023 11:44:47 +0800 Message-ID: <20230721034451.16412-7-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-Stat-Signature: nobkaj7nq5errerpkotbitfard7w94pk X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 841FD140009 X-Rspam-User: X-HE-Tag: 1689911115-128712 X-HE-Meta: U2FsdGVkX190f2agX0kpOagN9AUU1qwOCCLXxVS0tCSURClBJiDwEq4PctIjzFg5lzyMk4jP69uWJL3pywUJfI05yhek4H7sQpHULRBfhswpJDgwKwxhItcZ6At2LwpUn5Sftb9Q2y1n4PGs7gS9cGl/lDErSMR9RD4Zu16AeaqR5lxS5CuC2BN4X8mI/3byc1PGF9gMAaUydD0lK0fjFBac+f/3MwP/0PRYqzvve0ZCwru/2Kobope/eIcC3AaazNB2cTy3Eu7M1yQkgzgAnY7nP/a4Gcil5tcpfHl7B2YF638cD/8rnrv4IdnP/Q5mDXhhqfjywHoIJZsmpYJqO9Vau9ZQNlb9Udys1Tj9iGqel73bC1zgWv75GpiwZmdpnOdIPJa3+nL0ht8KxsioxKNywwj7lykq7P3cqxjdkDsn8M98L7LzbbCsAFvwGwUmnB0rW5TYTI4sIqbhD7lX3uZk14PPofqQMDtAiXzSHv0QXeNRd8wJJsK46JqhvB380Brt4Dfz2xfHtfESx4tEkl6o2suJqKIy/Yox0npW8K37RJXL0XrRROvLuWZa/uyyjlYPeUJ1y/5AHZVS8FPaRReH+cpcwlvfrnx6ZAA84Db1u+WS5GOWHeVc/dH35ElMenYj/Q/STyJctc7AbcC9QbhuiHqQ51iv9QcFKHgXi/ZFIGFUvd2lz0ry4hgg+ST38+W3OjFbp+plgGmqswjxIWPlGT6xyTE+4PFiBhFyxeMMatbfrtDCWpYaUoBRbBqopmOMNjefaa96SkzOGn6Ux2jGgOMP790ccrq+2h7u9ySTEia+aGJ7uwOcj5XsA+4LkDVEerUgiy8S0x6pDk5NwYzYGQQAbEvWgu541cBfTaxT/82sIHijihtwlR9saa/KNn4TWg3mAzveycnAnR7IiC2CZGW9Q2Gyr4nIQmbJ9FtnTHMFf2jVYh6GdVDQL0FD+SHgV3Pg7o/xfdjnJX6 JcaEfunm 0La0KaUUYF10MuPsGKGlZIfzd2As/kXegqu4+J3boVNsCcz5dhl1Vfh4UUsMUePwgalz6o9HNRHYcfvIFNm/eItKgB76jumS7EO26/rDRYR6rsEX+mp4CrB7qiqRHAwnEUwxL3RisBhvNzjk9IJfOnu166TpHyQymYeC9VIetdPuLO2u0dlWXpf2JgBq8ILi+sEoK 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 3b97289153f9..7e7a9f67b9ad 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -403,17 +403,17 @@ static void sio_read_complete(struct kiocb *iocb, long ret) if (ret == sio->len) { for (p = 0; p < sio->pages; p++) { - struct page *page = sio->bvec[p].bv_page; + struct folio *folio = page_folio(sio->bvec[p].bv_page); - SetPageUptodate(page); - unlock_page(page); + folio_mark_uptodate(folio); + folio_unlock(folio); } count_vm_events(PSWPIN, sio->pages); } else { for (p = 0; p < sio->pages; p++) { - struct page *page = sio->bvec[p].bv_page; + struct folio *folio = page_folio(sio->bvec[p].bv_page); - unlock_page(page); + folio_unlock(folio); } pr_alert_ratelimited("Read-error on swap-device\n"); }