From patchwork Tue Nov 14 08:44:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164760 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727440vqg; Tue, 14 Nov 2023 00:46:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IEHttkM/2ORFxzM1cqV+9U6NzsBgYXhatE4dv3jyhaWaZlYEmpHN0pzm3XLbxj4lbZEbnvD X-Received: by 2002:a05:6a20:7295:b0:181:a5ff:2dfa with SMTP id o21-20020a056a20729500b00181a5ff2dfamr2465720pzk.5.1699951611446; Tue, 14 Nov 2023 00:46:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951611; cv=none; d=google.com; s=arc-20160816; b=bB6SZ9c1HyzZLIwWI7YT++O6lpxArBfj8OWq7gBbHWfkjrlDEEzagv7EQ7oD8CKvSr 0v20n9wYHVNEqDRjit8eVCMCZ1EVqqPjfR7weo1Z/lf3wtmfrCwrY72XCHVv4DFw/GrF zdkjyTu51fN5cSKsKoffPskqjaXCqvmqybg5InxT/9ICVa47pkRSugKCIk6Lu3C6NVXJ ePgfgvOlG2nVlfYP/LaBljppp90H9RkdlbQZBqGmMWwo34HKX82Xf+v1IewQmp9KI82Z 2nafoOVERIdmK91gxaVmufXSI48+bLL/CIlNV1c1zIpOqZ4NjKS3Ba/qeKSrH/JbYpfv DfhA== 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 :dkim-signature; bh=D03uI3RFs+q47sPLqFS/hl468TfZmA9CDM9quyOjWII=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=z2qJtIe80z0FlVFGk9vck0wHqBdgvvBIEVnk5Dl1wUZAROf9P5sZ5mh0wwmeeA1Sc2 s+YecLP7hkZZm4EAO6dGWXPQ9/8OQYdc1KWEB0zT90dnmqJLEHCCHCCUA/7ax3u+ffqF whsBimSBeOz7Ff61674bJh1NXoMR4tSNrp+drdh5zcbRTEHkq/Dkls0uZBAQXPhEcLth AycEjUDhj/p86rRAdYmiw6UQBonOtxOHPl8fe4XsAisXk8Y1ObKukSE2z6/OvUUU6QCC QegnvIiQ0zaLglQvzmwG0hE2wwnqC0gaNAE0U4KXk8nDpet8pxNsXChrZtdDB7RcR50F BGfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="Rc+wf/+x"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id bw31-20020a056a02049f00b005b970288ac1si7780069pgb.190.2023.11.14.00.46.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:46:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="Rc+wf/+x"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id E84D780C347D; Tue, 14 Nov 2023 00:46:34 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232394AbjKNIpr (ORCPT + 30 others); Tue, 14 Nov 2023 03:45:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232383AbjKNIpj (ORCPT ); Tue, 14 Nov 2023 03:45:39 -0500 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9F131A8; Tue, 14 Nov 2023 00:45:34 -0800 (PST) Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6b77ab73c6fso4142629b3a.1; Tue, 14 Nov 2023 00:45:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951534; x=1700556334; darn=vger.kernel.org; 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=D03uI3RFs+q47sPLqFS/hl468TfZmA9CDM9quyOjWII=; b=Rc+wf/+xxTRFw2sLW/MX49h2Vyjtr5uaC9f74IPZumBsYP69ages2i6TzpLCRpUCzn TARk/evMn9Dk1/NbCEKe02wxDy441DgltNk9hcWvffRuxPSodMjAmOquphR9LD9fQnZC CGImK2CJHt5FnqyGCsgRZeSbJ0C94RuAfZXB4Ax5T8b2ru5mND4u1fkFiHDGuhL+O1Hw kXQuC+BR+qz5SMN+sYFzyzA8M/teEgbcbKbXsXraU2PFHrpBiuW0rBvGpW7v75nEX0Ze 3tpAzLt+IH1j1I0flTTO9OzT1nR5kFrIvdSN6ic2eLHxDlSB3crVVQ9FhfHL1keF7uak k3DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951534; x=1700556334; 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=D03uI3RFs+q47sPLqFS/hl468TfZmA9CDM9quyOjWII=; b=DaR9K2bmE2NG34BNReBhBRMzmLkzcTRGc2NNllEVSxrEZjwVAWm25NosRhzPQUMzWJ UUW4TtRXKZ41W8TJ8hhBBt1V3+3DqRUlwVdvlYMy2GI6EtLES3emxgAeiUlRzpEifmiK eT7lGFLEylZfVMNjUJoDnlRDWb5kFbbilvS/fglQbxBX+LCBR8KNx64iiTqjV85CtgV8 cz3J0x3d8BI6BnfW/UxyBraSje49ccjp9WaWxD+DQ+DF8DkC1iIpC8jgQ2BlHiKULCQq EaUPKP0L+EK78WO7ysqEyigRnH0YYHqO05NQuAFw7IdiF1S/CbHXha2kVnvG5yuJcb7m 7ZXg== X-Gm-Message-State: AOJu0YxmOrnaVlFNHi0vhcvOybzIc0XwMkTpZf3GBMYbw8YuyroOtokK dU6YG66D6tore4v/XZ+feMA1TWG89Z4= X-Received: by 2002:aa7:8b45:0:b0:6bf:15fb:4b32 with SMTP id i5-20020aa78b45000000b006bf15fb4b32mr2783598pfd.8.1699951533944; Tue, 14 Nov 2023 00:45:33 -0800 (PST) Received: from carrot.. (i223-218-133-131.s42.a014.ap.plala.or.jp. [223.218.133.131]) by smtp.gmail.com with ESMTPSA id u17-20020a056a00159100b006c4d2479c1asm748083pfk.219.2023.11.14.00.45.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:33 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 01/20] nilfs2: Add nilfs_end_folio_io() Date: Tue, 14 Nov 2023 17:44:17 +0900 Message-Id: <20231114084436.2755-2-konishi.ryusuke@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231114084436.2755-1-konishi.ryusuke@gmail.com> References: <20231114084436.2755-1-konishi.ryusuke@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:46:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528461317377956 X-GMAIL-MSGID: 1782528461317377956 From: "Matthew Wilcox (Oracle)" This is the folio counterpart of the existing nilfs_end_page_io() which is retained as a wrapper of nilfs_end_folio_io(). Replaces nine hidden calls to compound_head() with one. Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/segment.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 55e31cc903d1..1df03d0895be 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -1739,17 +1739,18 @@ static int nilfs_segctor_write(struct nilfs_sc_info *sci, return ret; } -static void nilfs_end_page_io(struct page *page, int err) +static void nilfs_end_folio_io(struct folio *folio, int err) { - if (!page) + if (!folio) return; - if (buffer_nilfs_node(page_buffers(page)) && !PageWriteback(page)) { + if (buffer_nilfs_node(folio_buffers(folio)) && + !folio_test_writeback(folio)) { /* * For b-tree node pages, this function may be called twice * or more because they might be split in a segment. */ - if (PageDirty(page)) { + if (folio_test_dirty(folio)) { /* * For pages holding split b-tree node buffers, dirty * flag on the buffers may be cleared discretely. @@ -1757,24 +1758,31 @@ static void nilfs_end_page_io(struct page *page, int err) * remaining buffers, and it must be cancelled if * all the buffers get cleaned later. */ - lock_page(page); - if (nilfs_page_buffers_clean(page)) - __nilfs_clear_page_dirty(page); - unlock_page(page); + folio_lock(folio); + if (nilfs_page_buffers_clean(&folio->page)) + __nilfs_clear_page_dirty(&folio->page); + folio_unlock(folio); } return; } if (!err) { - if (!nilfs_page_buffers_clean(page)) - __set_page_dirty_nobuffers(page); - ClearPageError(page); + if (!nilfs_page_buffers_clean(&folio->page)) + filemap_dirty_folio(folio->mapping, folio); + folio_clear_error(folio); } else { - __set_page_dirty_nobuffers(page); - SetPageError(page); + filemap_dirty_folio(folio->mapping, folio); + folio_set_error(folio); } - end_page_writeback(page); + folio_end_writeback(folio); +} + +static void nilfs_end_page_io(struct page *page, int err) +{ + if (!page) + return; + nilfs_end_folio_io(page_folio(page), err); } static void nilfs_abort_logs(struct list_head *logs, int err)