From patchwork Thu Jul 20 13:01:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 123273 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3118404vqt; Thu, 20 Jul 2023 06:28:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlFBkVEZsDZ1aaeehNdKSKyI3zRYtfprjgOoZmOGUmh/l8WdEMluw6nD1gp3WjwdCZlz6WMi X-Received: by 2002:a05:6a20:1c2:b0:105:6d0e:c046 with SMTP id 2-20020a056a2001c200b001056d0ec046mr19545924pzz.26.1689859705533; Thu, 20 Jul 2023 06:28:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689859705; cv=none; d=google.com; s=arc-20160816; b=efU5XkFBAhVqfBJh+Dz1FU3EC+X+/Yi1asv86cL6dMoMbfrHVkuTbsJD8fBS4iTmV7 zoHHpKdKCLXrsDFVckf9UbqMoC7m6eFLuQ0HLzjkjO0AzSYkN0GlvgeifOg2Bp/MVLXZ BXQT1qXhQdrvcbzP0fv5kUkmY6vDyJ9AXf2+vWeUWFydLFIocB/UPI25xKUzkdSDTaHF laR86pR5RhX+qEFBKE1wEY/qsrxG+mNDIZpkb3NCMMFbMXDKpdH7qrFtDASXNyfN8k98 eGShwLvIXUlYQusjZ3G7Jdaw7wNOSfN3KdgsfKxXLIwI7Fb2qeuC/wB5U2G6dSVTiiMs gmAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=2wILzb2wdzx6gb3QQe8NCuw5mHGSyWx+uSmLft9oKJA=; fh=q8rOnvZaN5Z50YvgZS1uBArX5ZcEEwPcusRFazgmNUQ=; b=VIMS0ksn+6z/u+dU9HW4zQi/wM6RKO/foqCmhpHbII0tzOrou0fqL7WpdLzGMb/aFx 8QqA5IClPPyHgMl0KRRI8y9K2+q5SxePsVMMq4wht/weHkhyhPirbOxnfZweB5cqd8k7 mg7aIaT5YSWmYxNL2hEJoHhN/JzxEuThZkXIRcnd4nFK12CK4ikAaV1x6msVdQ1PNI5v ZCQyX/ZqDoBdr0K7gByZkuq0BjLypL9+MX4FKOLFCG4iOem0o5FjlYS6t5DydRi94ZGq 1KMDoNI6s8lnAFxTm5Zf6NYYNXOlFqPy0npB50LIVVt/8zbCQ5RlUKa5BprUUXMjdema HgyQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h190-20020a6383c7000000b0055bc2612ed4si823898pge.39.2023.07.20.06.28.12; Thu, 20 Jul 2023 06:28:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231654AbjGTNCg (ORCPT + 99 others); Thu, 20 Jul 2023 09:02:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231432AbjGTNCZ (ORCPT ); Thu, 20 Jul 2023 09:02:25 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75F09269E for ; Thu, 20 Jul 2023 06:02:20 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4R6CW05Zwzz18Lhl; Thu, 20 Jul 2023 21:01:32 +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; Thu, 20 Jul 2023 21:02:17 +0800 From: Peng Zhang To: , , CC: , , , , , ZhangPeng Subject: [PATCH v3 04/10] mm/page_io: use a folio in __end_swap_bio_write() Date: Thu, 20 Jul 2023 21:01:41 +0800 Message-ID: <20230720130147.4071649-5-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230720130147.4071649-1-zhangpeng362@huawei.com> References: <20230720130147.4071649-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771946330736421741 X-GMAIL-MSGID: 1771946330736421741 From: ZhangPeng Saves two implicit call to compound_head(). Signed-off-by: ZhangPeng --- mm/page_io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 5ddb5d9c5013..d9f5fa5b7281 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -29,7 +29,7 @@ static void __end_swap_bio_write(struct bio *bio) { - struct page *page = bio_first_page_all(bio); + struct folio *folio = bio_first_folio_all(bio); if (bio->bi_status) { /* @@ -40,13 +40,13 @@ static void __end_swap_bio_write(struct bio *bio) * * Also clear PG_reclaim to avoid folio_rotate_reclaimable() */ - set_page_dirty(page); + folio_mark_dirty(folio); pr_alert_ratelimited("Write-error on swap-device (%u:%u:%llu)\n", MAJOR(bio_dev(bio)), MINOR(bio_dev(bio)), (unsigned long long)bio->bi_iter.bi_sector); - ClearPageReclaim(page); + folio_clear_reclaim(folio); } - end_page_writeback(page); + folio_end_writeback(folio); } static void end_swap_bio_write(struct bio *bio)