From patchwork Fri Jul 21 03:44:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 123548 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3550674vqt; Thu, 20 Jul 2023 21:28:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlHVzky7DaaNzByt8Wk5DwuVIhivcCc9tlY759Ls9HZhWrraxJbMhmtRo8xKsJyREwjuMzCU X-Received: by 2002:a17:906:cc0c:b0:982:8de1:aad9 with SMTP id ml12-20020a170906cc0c00b009828de1aad9mr707171ejb.64.1689913730421; Thu, 20 Jul 2023 21:28:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689913730; cv=none; d=google.com; s=arc-20160816; b=ROqqeLUscyWeXVIChCnPR7R03HABZ95zAP83m1IF231j1zDwtg2I055Abkwyu1B41w w4Spd3ItVkCDzJo/QFz9oQ9Ax+LgZe9RhSC3049MHGMgzwwhDqunO9OJUcR05XDx7nRK wnBUv0xNzg8ojf4YXa7y+/ClUr+sC/qsPI75CePdnEFcb2t05cAlv/pc9tAmdcr4bnUl lNQ3STf8ynQzuEF5RPQoOWthHVGMBscAqQep+VuP4cOpAMRqecOXN8ZVILd64GGMqZfv GZ/RNAK61I8GOYK2P1i9Qa0lvbQ2nGuupFtUofaMyKCFjTy7rLuYRBxFW33RWK8Ocyo7 INJQ== 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=VU82ms8EcyOoJ6XIfyTJzdHVcY39DDeQHThHJ3V6hjn9gj/Wry92wQKBEEWQbrHHXg l9/fDMePqmHMcgyB/aHokIXuL37s6lJG5wNxMkY1fLKYif+dPvtABEHa05cjVO/ImKBu IuNABRKQXNTWJyRmGNUom2uvlvoCRpvWE1wgYhO2ty1l+jv1PguIW6kb9E2El9E1HfKh BCVcQvjAg54kxGHE0G6dByRIFmaQkNUjSWJJRmvmjZWClYiLt2yb1CSvyvgOGNNbNIt2 /nejGIqM/6DzmOy7RXsVmh1d+rGk2O4sbgitY4QdxC7tgL0a6ZQROU9RYH+kGdsOs6bI LHuQ== 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 k17-20020a1709065fd100b009969e8865c6si1531379ejv.491.2023.07.20.21.28.26; Thu, 20 Jul 2023 21:28:50 -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 S230146AbjGUDpY (ORCPT + 99 others); Thu, 20 Jul 2023 23:45:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230053AbjGUDpO (ORCPT ); Thu, 20 Jul 2023 23:45:14 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39F251BFC for ; Thu, 20 Jul 2023 20:45:13 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4R6b4x0PtvzVjnQ; Fri, 21 Jul 2023 11:43:45 +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:10 +0800 From: Peng Zhang To: , , CC: , , , , , ZhangPeng Subject: [PATCH v4 04/10] mm/page_io: use a folio in __end_swap_bio_write() Date: Fri, 21 Jul 2023 11:44:45 +0800 Message-ID: <20230721034451.16412-5-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-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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: 1772002979758634775 X-GMAIL-MSGID: 1772002979758634775 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)