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) From patchwork Tue Nov 14 08:44:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164756 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727215vqg; Tue, 14 Nov 2023 00:46:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IHWBIgz8BbtMa/fksSW9EovkjiQxTYRNWytJLyhzxumARZ5nX1XaVeFmLurTtBiHLL+ILq+ X-Received: by 2002:a17:902:c40a:b0:1cc:337e:bd6d with SMTP id k10-20020a170902c40a00b001cc337ebd6dmr2017927plk.68.1699951576243; Tue, 14 Nov 2023 00:46:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951576; cv=none; d=google.com; s=arc-20160816; b=crlBg33dDD4Tj8sOykmoS5EZ7nyUKf3LELe2cCvNxtuqZkWFPamtrANSMzTjIS+S+X QVOpxC+JRNu1qlKru4APqMHQg3y3B6n3iPBhgL9P+rzp8kaitNddGL9W+AyVLQESJaS8 YPM6ex3KfldLGIqFCTM7khK2wooKUxn+PrkD7nF2merZMHyn277La5FCvfUhdXEym06C +o4CY6M1RWmlfNtRK5peF44GylEnnkOZQHdek4FV/gcUL5Z0kJJJivtFJusQMFBrwpvs 0tZVZc1vHg7J1U4H0UUcdKA9Q5xsQdo86pikdRdA+2ITKUnYyKuj5lPMAA1mwJD31xoA q9VA== 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=yWvfE7i+Wd531m2SA+EEUbQTk1YRMjmDg9WKu9uNV+I=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=tbDXqEE6wimFdNk4ChOFXF6rjjbE/hAPVCtYNJrfRvCW7bdJmx8F199FTtvx+Kjgwi 691wBcUQTsnibgYpOoyAeKR8zupqNw2FsqquY0VrQspWheiHCFC7EKeCmHNJwyRmjX67 Jb6BLMkWbNdQZP1SL44KjDdhhnxy1y0Vu4k10JSJUvyDnQ34naYpeXSKt+RggtXUEd9A TjfR+OLQC3f3NgWbBCeEh/Igx/G6F+fZ7waLleeaR12bOO7/Y3t4s88nqrDgiThHMuOE /C95v9M3lUkRfocuFN9XePeOd6QhTRTJv6hTTpQrhn3+oiieTmjAj/eW6TAuGSAuTUmS 9GAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZcZ009Ai; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id z16-20020a170903019000b001c9c108bf6esi7938059plg.387.2023.11.14.00.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:46:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZcZ009Ai; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 751888099CC4; Tue, 14 Nov 2023 00:46:09 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232425AbjKNIpo (ORCPT + 30 others); Tue, 14 Nov 2023 03:45:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232394AbjKNIpk (ORCPT ); Tue, 14 Nov 2023 03:45:40 -0500 Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 932621AA; Tue, 14 Nov 2023 00:45:36 -0800 (PST) Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-1f0f94943d9so2586057fac.2; Tue, 14 Nov 2023 00:45:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951536; x=1700556336; 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=yWvfE7i+Wd531m2SA+EEUbQTk1YRMjmDg9WKu9uNV+I=; b=ZcZ009AiJgpxRqcxcMEfaPhOlJV0MCqCrRPP0QfluVr3EkRyDN1zFwpKHh3c2xNYl8 AAg8wrdIZYrBtMBMMs/d1FFoGTNCCkAEhBQa/kY4g50h5C24v58hepmmziRLJkxk59yz XeEVbbba6fSDetEK7ain4lcOT6oMrHBKqyEzrkCt3boL9OHHYhx3cSxplJqbmFcv7Sdf FHZaFbuz0HQliOKa09WLJdz7U/nO09099u+9uNRVj0EguBVgpzT/WcT467704YauVbjL Pnaw8UnoaGaAHLlqc0zrqZCNRpgdl6Wr69MGIWbVaFdh/ofQ07CyLJBaxYgwwpShsbBd lAWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951536; x=1700556336; 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=yWvfE7i+Wd531m2SA+EEUbQTk1YRMjmDg9WKu9uNV+I=; b=oS3jVLA/u0cL3pGNOVoeCrHVyMxnmVuMSEankOPnZrT7xh5O1LiBtOa302UqAP4x2m N5iVbndN++ufS1rFUE58QJlL1Ht5nHLsCncRKSvadgMe3FyvWWKMZ8iUl64blEBjlImZ X009s5iH5As7oRSCqtIjMEX5UKkoMv2bKg2uboUvJIlHDEjqTsGsZtWjYtBQvtsJAdhA ZLvscumrzXqT026mei6hZ5ooCWvJR4rMztog2sULacKLvdb+Lk0dBUebKd+X8qZo4nkP HeXJxTWh2sr5ApzdLY+/1WgVI/fZ5aF02TC6y9e55/GqUxfByWVjPlTwZeQuR4Bn/AJ4 yvDQ== X-Gm-Message-State: AOJu0YyHc/6sml8aiBXXUyIDWvU+kqkWcCmbYtQn6kAS4xjZWZfrscW7 +E1iuzx3E/HpM+oNATzddqPSu695rz8= X-Received: by 2002:a05:6871:5a8f:b0:1f0:630b:c84e with SMTP id oo15-20020a0568715a8f00b001f0630bc84emr9199228oac.57.1699951535866; Tue, 14 Nov 2023 00:45:35 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:35 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 02/20] nilfs2: Convert nilfs_abort_logs to use folios Date: Tue, 14 Nov 2023 17:44:18 +0900 Message-Id: <20231114084436.2755-3-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 agentk.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 (agentk.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:46:09 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528424299321172 X-GMAIL-MSGID: 1782528424299321172 From: "Matthew Wilcox (Oracle)" Use the new folio APIs, saving five hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/segment.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 1df03d0895be..730062e79bfc 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -1788,7 +1788,7 @@ static void nilfs_end_page_io(struct page *page, int err) static void nilfs_abort_logs(struct list_head *logs, int err) { struct nilfs_segment_buffer *segbuf; - struct page *bd_page = NULL, *fs_page = NULL; + struct folio *bd_folio = NULL, *fs_folio = NULL; struct buffer_head *bh; if (list_empty(logs)) @@ -1798,10 +1798,10 @@ static void nilfs_abort_logs(struct list_head *logs, int err) list_for_each_entry(bh, &segbuf->sb_segsum_buffers, b_assoc_buffers) { clear_buffer_uptodate(bh); - if (bh->b_page != bd_page) { - if (bd_page) - end_page_writeback(bd_page); - bd_page = bh->b_page; + if (bh->b_folio != bd_folio) { + if (bd_folio) + folio_end_writeback(bd_folio); + bd_folio = bh->b_folio; } } @@ -1810,22 +1810,22 @@ static void nilfs_abort_logs(struct list_head *logs, int err) clear_buffer_async_write(bh); if (bh == segbuf->sb_super_root) { clear_buffer_uptodate(bh); - if (bh->b_page != bd_page) { - end_page_writeback(bd_page); - bd_page = bh->b_page; + if (bh->b_folio != bd_folio) { + folio_end_writeback(bd_folio); + bd_folio = bh->b_folio; } break; } - if (bh->b_page != fs_page) { - nilfs_end_page_io(fs_page, err); - fs_page = bh->b_page; + if (bh->b_folio != fs_folio) { + nilfs_end_folio_io(fs_folio, err); + fs_folio = bh->b_folio; } } } - if (bd_page) - end_page_writeback(bd_page); + if (bd_folio) + folio_end_writeback(bd_folio); - nilfs_end_page_io(fs_page, err); + nilfs_end_folio_io(fs_folio, err); } static void nilfs_segctor_abort_construction(struct nilfs_sc_info *sci, From patchwork Tue Nov 14 08:44:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164757 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727252vqg; Tue, 14 Nov 2023 00:46:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IEu7jMuUZPFSb3vut4EAw1kahcFOAKqHY2731lCwNz5FjkoAeCmrRXSlbTSyq2kUHJFlSBI X-Received: by 2002:a05:6358:6f04:b0:169:98e4:aeeb with SMTP id r4-20020a0563586f0400b0016998e4aeebmr1957608rwn.23.1699951582883; Tue, 14 Nov 2023 00:46:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951582; cv=none; d=google.com; s=arc-20160816; b=P+xI7T1Xrw/NpWpQzyySJnfcmlrMNc3JFkBGoAARE46tq7HmaIAD15eTz0kHJ5VQMG DhBCB9mGO+edBtyCT+3b/gVn2NEmsOc3dpuNjuNBa0PhoZUGiWs44WG1fMpf+Bfmt461 wjC/pAcrkC3iZGiItoa+Woj3lLWvypPUTQMcvEoPw2N1yPID3tkGaisQKpU7C7B4ND5X BkEUpHLBCAuLMlXhO33loks/5HEExNLb8+P+LFo//W806QXryh7vXWcq+QtEZcdqaBZ1 ud7M7ub3PGDGc+vO4a9iqZ1Y34++MY2BmNeiBbEyqn1r7oO5ADjHt5Fwvh60CSjq9lBl fnsA== 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=OKRmXBsUtiL4RTZEjbskUkxZvc6fttLs7R2u2to+Cz0=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=zTPR0UR06fJ+SpffYumkLscWmbdzG8b0IuI75sYd14/9nTdAx2WeAVUVVk0W0yZsH6 ael5PH9t9PFToBFBxxJWEvcfXmh439qOwe86a8Fx/3VQF+BX+wQH/u9aMr014mJqGXoy ca2RnhTfMHIUDtZl56ZznWVqS2+nyNeutBbGtVfa95ucwjgCpBod1CcO84WhjanoNMrr hXitgEqPyR12X2/b7yMvWWhGnUcdHqolN7lBDBk1XzdkbBkMLDNF+/EH9VzTqBi9Ij7s FmmLqf1t7+yPg0BI4SQXkfSZvVS1VjTgNdRYjyKcqhfJw8ZBUX7YVAveyKrB2kbdJCMv 2HMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=dsQAd3LU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id h5-20020a656385000000b0056f7f18bbfdsi7297805pgv.632.2023.11.14.00.46.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:46:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=dsQAd3LU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id A4F44804A233; Tue, 14 Nov 2023 00:46:15 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232430AbjKNIpw (ORCPT + 30 others); Tue, 14 Nov 2023 03:45:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232406AbjKNIpm (ORCPT ); Tue, 14 Nov 2023 03:45:42 -0500 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FAD11A8; Tue, 14 Nov 2023 00:45:38 -0800 (PST) Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-6b87c1edfd5so4179534b3a.1; Tue, 14 Nov 2023 00:45:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951538; x=1700556338; 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=OKRmXBsUtiL4RTZEjbskUkxZvc6fttLs7R2u2to+Cz0=; b=dsQAd3LUkUw5DlwA8A03vrQCGBDA0tsZcA6eVnfhp40j95KxhAPrc4sgmfUGfmHopo H7fEzku/cTsTnILzJlzPMYCqDNSELpUNROX0AIuoZszJYv8y1Fi1IW+/FWEkTnHbnwkm bC3Cn6SZrny/7FPzg3a7UpIbtLetkEiw8YOSOZFj/weOceyKF4Vf+u5f8xQ5ktWTivZw ugQS2gKtlMH1nfHt1CnEQWc3EUQfPdPjeR35Wpea+lq5Ful0gf9tf8QseFbaIuMCnXK1 YreTtYuBMAeVKTgnZyvWQqrL7+Y2EEu0+dTErl4xu6kki8+DZntwEUxai4VAv6TnbdCn HI4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951538; x=1700556338; 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=OKRmXBsUtiL4RTZEjbskUkxZvc6fttLs7R2u2to+Cz0=; b=G99gcI7lNKx+6eEOkAed1qHtwen4rPNiMQ8ni60i4bbcw2bV8h/tpV+5wyEbv9znbv bzHhv41a5C1g2fbT3ahGY8OounxHmIfFjo/5dP+uqyZsJgfvU+udyAZx7HtB4LrJEF5N sjj1dCrrq6/Anf7mRx4jzOdoqHnJLFmnMK5Hnng74uHVkQmdFWONs830YeZQwzv12Ygg IxekjXfgHo0Q2R9ekgImYxJnyxs76OSwEkcQZOEQHxrnXUIxEOGz9836RHBOTtH6CfO+ YxkuJ5EcaYA5ZpTrnQqlce+jQPfsjETi9Dnt6DnYBKI+4bXObY55e+Rniu7VV81pzRET s8fw== X-Gm-Message-State: AOJu0YxFG3asawgJdg81K4S2r/oIb8WDUBXGEDiRZLb9uCHrZ66vj5o4 GLYwOVvru7aS/eE2CHoEIJXDuS2uQmE= X-Received: by 2002:a05:6a00:d44:b0:6c3:74d6:596e with SMTP id n4-20020a056a000d4400b006c374d6596emr5464562pfv.10.1699951537782; Tue, 14 Nov 2023 00:45:37 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:37 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 03/20] nilfs2: Convert nilfs_segctor_complete_write to use folios Date: Tue, 14 Nov 2023 17:44:19 +0900 Message-Id: <20231114084436.2755-4-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 agentk.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 (agentk.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:46:15 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528430891757041 X-GMAIL-MSGID: 1782528430891757041 From: "Matthew Wilcox (Oracle)" Use the new folio APIs, saving five calls to compound_head(). This includes the last callers of nilfs_end_page_io(), so remove that too. Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/segment.c | 49 +++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 730062e79bfc..2a058aad5c2d 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -1778,13 +1778,6 @@ static void nilfs_end_folio_io(struct folio *folio, int err) 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) { struct nilfs_segment_buffer *segbuf; @@ -1867,7 +1860,7 @@ static void nilfs_set_next_segment(struct the_nilfs *nilfs, static void nilfs_segctor_complete_write(struct nilfs_sc_info *sci) { struct nilfs_segment_buffer *segbuf; - struct page *bd_page = NULL, *fs_page = NULL; + struct folio *bd_folio = NULL, *fs_folio = NULL; struct the_nilfs *nilfs = sci->sc_super->s_fs_info; int update_sr = false; @@ -1878,21 +1871,21 @@ static void nilfs_segctor_complete_write(struct nilfs_sc_info *sci) b_assoc_buffers) { set_buffer_uptodate(bh); clear_buffer_dirty(bh); - if (bh->b_page != bd_page) { - if (bd_page) - end_page_writeback(bd_page); - bd_page = bh->b_page; + if (bh->b_folio != bd_folio) { + if (bd_folio) + folio_end_writeback(bd_folio); + bd_folio = bh->b_folio; } } /* - * We assume that the buffers which belong to the same page + * We assume that the buffers which belong to the same folio * continue over the buffer list. - * Under this assumption, the last BHs of pages is - * identifiable by the discontinuity of bh->b_page - * (page != fs_page). + * Under this assumption, the last BHs of folios is + * identifiable by the discontinuity of bh->b_folio + * (folio != fs_folio). * * For B-tree node blocks, however, this assumption is not - * guaranteed. The cleanup code of B-tree node pages needs + * guaranteed. The cleanup code of B-tree node folios needs * special care. */ list_for_each_entry(bh, &segbuf->sb_payload_buffers, @@ -1905,16 +1898,16 @@ static void nilfs_segctor_complete_write(struct nilfs_sc_info *sci) set_mask_bits(&bh->b_state, clear_bits, set_bits); if (bh == segbuf->sb_super_root) { - if (bh->b_page != bd_page) { - end_page_writeback(bd_page); - bd_page = bh->b_page; + if (bh->b_folio != bd_folio) { + folio_end_writeback(bd_folio); + bd_folio = bh->b_folio; } update_sr = true; break; } - if (bh->b_page != fs_page) { - nilfs_end_page_io(fs_page, 0); - fs_page = bh->b_page; + if (bh->b_folio != fs_folio) { + nilfs_end_folio_io(fs_folio, 0); + fs_folio = bh->b_folio; } } @@ -1928,13 +1921,13 @@ static void nilfs_segctor_complete_write(struct nilfs_sc_info *sci) } } /* - * Since pages may continue over multiple segment buffers, - * end of the last page must be checked outside of the loop. + * Since folios may continue over multiple segment buffers, + * end of the last folio must be checked outside of the loop. */ - if (bd_page) - end_page_writeback(bd_page); + if (bd_folio) + folio_end_writeback(bd_folio); - nilfs_end_page_io(fs_page, 0); + nilfs_end_folio_io(fs_folio, 0); nilfs_drop_collected_inodes(&sci->sc_dirty_files); From patchwork Tue Nov 14 08:44:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164762 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727774vqg; Tue, 14 Nov 2023 00:47:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IE6DOGXDikxcZOa06r/CyoLEI03gH8Lf8wL2jGKPpVsRtJ77cSyLz83+gpHUXFLI96JXRIr X-Received: by 2002:a17:902:bf02:b0:1cc:6597:f40b with SMTP id bi2-20020a170902bf0200b001cc6597f40bmr1594300plb.36.1699951666144; Tue, 14 Nov 2023 00:47:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951666; cv=none; d=google.com; s=arc-20160816; b=wUk1XhGeyQQHMD70STCWhOLr9izu6/lK0PFIDwyvGRvNwai5LL/gU/SaXn5KAjPDqN HzSRY/qA3fSdbo7vSdxHArRJVwtY9+13SPRjd8r0+GFXuQz6DqLTXiT2mrwZkV2QXy2Q E2CFQ4yODPuh372NOoYzKynY511JCSRtXBqvf+h11TSQMwxtQkpTifs4Qr/BGiDJICMJ VVmyzckRdklGykvHtbil8bEXSGZaShJD4AsO1WdBhRFzOyFkpkZVtCs07uCgx+BVWIHv 9eXXVyGD/7Lk5Mrd/uZJ81+5zMGjiFSrVI8/kGW9uwnGCjKbH8RrS8aI5T+jFjixbFtV ztTA== 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=OgKg2EOxZmZGIT91NGubi8L9VnRq79wrMG69PPwZDig=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=EU47JTGj5jP738yjtLGhuDBBRGDGoUZR/vWemA0sMiNuDptZy8V+Qr6kW/8LXHhQW8 jl8ZoOGmEh3pstfKXlLXyc6r3szouxUBa8SbDtMOqiTPh2r34JpdsfzGJYkR2OfeX9nT 0mIwSgvrjRnX4LoIETX+38n47oFh6lwcA17C7yfP36ezYls5Yu1VnTTsx6VfOxvU3vYM fv4/GrDz9E7g8tYl0zTiPEKPZJMyiezN79ub5sny0N1rn6zzGHskUgk0n+aHoanF2LFa d02TidzTQD30d1JLDZ+gFHsafqE1FD036wYaWJ1T6n1323zFoqatXRXF44fzGqvUWiCw cydw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="LfuSs1/+"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id w13-20020a170902d3cd00b001c9faf1439esi7309892plb.288.2023.11.14.00.47.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:47:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="LfuSs1/+"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 6C1BE8069D81; Tue, 14 Nov 2023 00:46:08 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232454AbjKNIp5 (ORCPT + 30 others); Tue, 14 Nov 2023 03:45:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232410AbjKNIpn (ORCPT ); Tue, 14 Nov 2023 03:45:43 -0500 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 531EB1A8; Tue, 14 Nov 2023 00:45:40 -0800 (PST) Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-6be1bc5aa1cso5507494b3a.3; Tue, 14 Nov 2023 00:45:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951540; x=1700556340; 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=OgKg2EOxZmZGIT91NGubi8L9VnRq79wrMG69PPwZDig=; b=LfuSs1/+ZMUH8Y68R6LMkE0FxVmSNB/C5HAwh15u5Ikx3J3neSpv/v1lOq+QmwRJQs zccIA/pjXoNVt9csPXNHFFVXMXwQ1k3W1zZbjWuxobPBxRy12u2/mndCDLutN32uist8 YEYP0c18Cgv0SZwhUWoj9HEX+4Fruxj1pErGzf6upNdAsab9NJgek3Lquug19vyCZ1fc RMzqJ1qK8IJW0MbHxpAhcLeHAETeEGOyWz/mCwuB384nTQuN8lLiThbyFO1WG8t/MmWq ZaVWrOSn8ABPP69oxDF0nWaPezWt+Xr87/O53PZEsM+70tcDRLTWwos2wNhByf28q3HL GuRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951540; x=1700556340; 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=OgKg2EOxZmZGIT91NGubi8L9VnRq79wrMG69PPwZDig=; b=pY8v8GF+C/cLrrIoIuhFPaIC4D8xlXa1ynMjqtuXFS/e95BgQWQTSvZhN0t3UBxv9r 0zIofP2sPb7GoOeVDk4xUaRQcfnCHLhSSY2JBeXrvzXrYNZ/k2HnGaiNBDEo8TwPQg0T a86W8Jbb/h32XR/ekG+WfiFhdtaj1JySwpl8rhQSwT3TGHoCSmpWNLbwRE46ZjoKMPva 0XrwgHOP0gT05ydH7J9/LZjYijCsqzajM+PWd9Ve+OErIx6t5qRXeDjox/ngHyiwfz21 SOLuCoFhbGzj2+LVOy8gpgcRq696SH6IUMGFJcEQwDWx0Mk3JhPJzN48Y9x9Q1Oq/nCN RgoA== X-Gm-Message-State: AOJu0Yy3M/wN338lka4GtsYUxgZX4tvv0f/TE1AoL/gTS7liKlqUaM4b BgZf9lPQzpstVGTm7gkAMcnN0ZMnn58= X-Received: by 2002:a05:6a00:1d8d:b0:6c4:e7a0:af29 with SMTP id z13-20020a056a001d8d00b006c4e7a0af29mr10589103pfw.19.1699951539723; Tue, 14 Nov 2023 00:45:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:39 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 04/20] nilfs2: Convert nilfs_forget_buffer to use a folio Date: Tue, 14 Nov 2023 17:44:20 +0900 Message-Id: <20231114084436.2755-5-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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:46:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528517873031961 X-GMAIL-MSGID: 1782528517873031961 From: "Matthew Wilcox (Oracle)" Save two hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/page.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index 06b04758f289..3882acde1b3e 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c @@ -73,7 +73,7 @@ struct buffer_head *nilfs_grab_buffer(struct inode *inode, */ void nilfs_forget_buffer(struct buffer_head *bh) { - struct page *page = bh->b_page; + struct folio *folio = bh->b_folio; const unsigned long clear_bits = (BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) | BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) | @@ -81,12 +81,12 @@ void nilfs_forget_buffer(struct buffer_head *bh) lock_buffer(bh); set_mask_bits(&bh->b_state, clear_bits, 0); - if (nilfs_page_buffers_clean(page)) - __nilfs_clear_page_dirty(page); + if (nilfs_page_buffers_clean(&folio->page)) + __nilfs_clear_page_dirty(&folio->page); bh->b_blocknr = -1; - ClearPageUptodate(page); - ClearPageMappedToDisk(page); + folio_clear_uptodate(folio); + folio_clear_mappedtodisk(folio); unlock_buffer(bh); brelse(bh); } From patchwork Tue Nov 14 08:44:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164759 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727401vqg; Tue, 14 Nov 2023 00:46:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IF58XNtDm9S1g84QQeC90Ipq/5fvd/Lr+EGAmOp81brXLHBycayaGK5nAEjVpWaBnIW4vQ5 X-Received: by 2002:a17:903:130f:b0:1cc:5dd4:7cf8 with SMTP id iy15-20020a170903130f00b001cc5dd47cf8mr1445369plb.27.1699951604008; Tue, 14 Nov 2023 00:46:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951603; cv=none; d=google.com; s=arc-20160816; b=Tfg2ZOec2HY3Qm6xFpFG+915wSPbwJZTfOdPZMZ8nMMOmZvOTm+//VZRBjy2I2Gb2t DnBOcPWw8r6TnJ7sIl/Z898au6NOkM8bjKuUhjXuOsCEtcOreigSnZvNcf98FuCMTgXO /YsNrgbFO8frgjAtLfboY3NvDOfXR9NH0R9/WoJDVi9dbb2YFI39NqAqRTnp7eIk9nzQ f6E34mLScdvsOMKUcu1A4udwLiYS1aDMPupYkbCiS7CWO6++G/uc9+pMF/QVQnMRgdZA Ol/JCJ16eKwrsM3MZcrjkDlP2DQIdStR4jg3Q/0O3+gxF9K35a6tysxwRfsFW0N63hLb VKQw== 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=qsODlSSSo65NAC+DA2frAnS4pga3MJdWGA/tkcnA7Uo=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=XYX0j/N6dPQ3wz13U/FYBt7UFvpYscISjqvUGxsT7NQ2aTBznyRV2XpR7Tq5zkjftb /ae59nF4UD0WhJ8kTeUTaAd4CkH9t9D+SjRg+YhEsbRBI/WvdM5TKBdTotGuDOk6BzLH v37XBQ29y7or+ZV9+T4liVaTFAhvM4G/vyz47bznWeM+GK/KiQxb+k+8qZoKfpmP8AqA cmR2nvNAz8lAZl6exT4Ubv7jew1B5W/AVmH+CorKkVlVgJI/kP15D9J/CmVbV3m1LAkt erHFk8nkdoufXf7bUVpDU6WYh2KvgLUElDer0EFX3DieTl6Lj6Zqe4dnGfDiAW1jvUcR WG5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Me6WJPKI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id p7-20020a1709026b8700b001b9c1821f6bsi7284082plk.98.2023.11.14.00.46.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:46:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Me6WJPKI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id AE2718041950; Tue, 14 Nov 2023 00:46:34 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232168AbjKNIqA (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232416AbjKNIpq (ORCPT ); Tue, 14 Nov 2023 03:45:46 -0500 Received: from mail-oo1-xc2a.google.com (mail-oo1-xc2a.google.com [IPv6:2607:f8b0:4864:20::c2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADDA51AD; Tue, 14 Nov 2023 00:45:42 -0800 (PST) Received: by mail-oo1-xc2a.google.com with SMTP id 006d021491bc7-586ba7cdb6bso3058720eaf.2; Tue, 14 Nov 2023 00:45:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951542; x=1700556342; 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=qsODlSSSo65NAC+DA2frAnS4pga3MJdWGA/tkcnA7Uo=; b=Me6WJPKINwOlt8beNUWkrP143YEOT2s90A06OXfnOz/0SiJ7mpaYcG9bB2Z+BQYM5e BLW5t0G5ebOJVk/AAB6wz61EhTHTRcetUfbKVskaLdX7l8EgvzkW4xCuLyMzTTEd9KvZ tf7oWX5tjLVizRPSIqkTNS2iqtmzn+zXLk6gL7v/znjWcaozUt/S1XlzIbFhMOrJsB9H 5bW54ABbl17/xk/7K4UDWL7I34Alnd+zPRqfLxpxjGKontZMXGc9N9Gc0qCK/qtKaxWr IHtHBPjYP+AB61eReG5PJ/VVxnrSg58Th731gyGnT2rPjbSZVUuJbdHw2AcavjV3MaEx YNOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951542; x=1700556342; 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=qsODlSSSo65NAC+DA2frAnS4pga3MJdWGA/tkcnA7Uo=; b=bvX+B+Cp7v+vYFy0qj2XdVH8pHWerQRJzp1oOj7JZhjrspl34paMeaCk/hoC79WQpA h0oll3fkyqKFLJZE9yL/oxfH9pTbqlio5d6p6riU68psmJQHYw+1CB1JtA+g1PazX41l aBKeEq6CRhPnVpZKMY2BEgiHKVLbi6c+bRt+W3EjPta6Ae8v7Sq/bjI/53PmfIsLFOFg wZN+7ToolpNYo2uqcjTWgMYMrTd2zJwR/3UpEuNbO38FVb8uFtw74XEacv5b+PgyuCt/ lHmNHoqzet3McEdv7kZYwoV1IfcPg0w31PPTYqFQgY0I1zdiqnIRSCD6HHI6XeDaPoYl 8nLA== X-Gm-Message-State: AOJu0Yzh7IcoCN57CQIij5I2LB5XaKe4onwg1f6l6kiJJ/3DAo0BEAao t9kvUpdKbKsqfJxOkE/enM1vhMghtp8= X-Received: by 2002:a05:6871:5d2:b0:1e9:af81:54b6 with SMTP id v18-20020a05687105d200b001e9af8154b6mr12509563oan.55.1699951541863; Tue, 14 Nov 2023 00:45:41 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:41 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 05/20] nilfs2: Convert to nilfs_folio_buffers_clean() Date: Tue, 14 Nov 2023 17:44:21 +0900 Message-Id: <20231114084436.2755-6-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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:46:34 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528452988773817 X-GMAIL-MSGID: 1782528452988773817 From: "Matthew Wilcox (Oracle)" All callers of nilfs_page_buffers_clean() now have a folio, so convert it to take a folio. While I'm at it, make it return a bool. Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/page.c | 18 +++++++++--------- fs/nilfs2/page.h | 2 +- fs/nilfs2/segment.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index 3882acde1b3e..29799a49c234 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c @@ -81,7 +81,7 @@ void nilfs_forget_buffer(struct buffer_head *bh) lock_buffer(bh); set_mask_bits(&bh->b_state, clear_bits, 0); - if (nilfs_page_buffers_clean(&folio->page)) + if (nilfs_folio_buffers_clean(folio)) __nilfs_clear_page_dirty(&folio->page); bh->b_blocknr = -1; @@ -131,23 +131,23 @@ void nilfs_copy_buffer(struct buffer_head *dbh, struct buffer_head *sbh) } /** - * nilfs_page_buffers_clean - check if a page has dirty buffers or not. - * @page: page to be checked + * nilfs_folio_buffers_clean - Check if a folio has dirty buffers or not. + * @folio: Folio to be checked. * - * nilfs_page_buffers_clean() returns zero if the page has dirty buffers. - * Otherwise, it returns non-zero value. + * nilfs_folio_buffers_clean() returns false if the folio has dirty buffers. + * Otherwise, it returns true. */ -int nilfs_page_buffers_clean(struct page *page) +bool nilfs_folio_buffers_clean(struct folio *folio) { struct buffer_head *bh, *head; - bh = head = page_buffers(page); + bh = head = folio_buffers(folio); do { if (buffer_dirty(bh)) - return 0; + return false; bh = bh->b_this_page; } while (bh != head); - return 1; + return true; } void nilfs_page_bug(struct page *page) diff --git a/fs/nilfs2/page.h b/fs/nilfs2/page.h index d249ea1cefff..a8ab800e689c 100644 --- a/fs/nilfs2/page.h +++ b/fs/nilfs2/page.h @@ -36,7 +36,7 @@ struct buffer_head *nilfs_grab_buffer(struct inode *, struct address_space *, unsigned long, unsigned long); void nilfs_forget_buffer(struct buffer_head *); void nilfs_copy_buffer(struct buffer_head *, struct buffer_head *); -int nilfs_page_buffers_clean(struct page *); +bool nilfs_folio_buffers_clean(struct folio *); void nilfs_page_bug(struct page *); int nilfs_copy_dirty_pages(struct address_space *, struct address_space *); diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 2a058aad5c2d..888b8606a1e8 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -1759,7 +1759,7 @@ static void nilfs_end_folio_io(struct folio *folio, int err) * all the buffers get cleaned later. */ folio_lock(folio); - if (nilfs_page_buffers_clean(&folio->page)) + if (nilfs_folio_buffers_clean(folio)) __nilfs_clear_page_dirty(&folio->page); folio_unlock(folio); } @@ -1767,7 +1767,7 @@ static void nilfs_end_folio_io(struct folio *folio, int err) } if (!err) { - if (!nilfs_page_buffers_clean(&folio->page)) + if (!nilfs_folio_buffers_clean(folio)) filemap_dirty_folio(folio->mapping, folio); folio_clear_error(folio); } else { From patchwork Tue Nov 14 08:44:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164763 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727786vqg; Tue, 14 Nov 2023 00:47:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IEhiu0AjA55HdrZK1EXcSwFx0IVY+YHnFKmWBL0EQ0YaChN8YFaugDmoTp5P04qR91wqLEM X-Received: by 2002:a17:902:e543:b0:1cc:68c4:8c60 with SMTP id n3-20020a170902e54300b001cc68c48c60mr1873059plf.18.1699951668606; Tue, 14 Nov 2023 00:47:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951668; cv=none; d=google.com; s=arc-20160816; b=jto7xUivy1/lUk0NUGOkrGTLalEPlxMTy0wz8tg+Ekpn9pKx0U6YobJPE5ZsE9p6Kb y/wvVJeu/2gr8JLyFyi+v9q4UP2HJReqKP2O3lZeDG5up2QPoHcs/AR8ozCimiotaohY EhA6kXPfsrBQLy210vktFI5mBLWMoQHq84psSutOkK36SUVcLyIsOU37E5PPqVC7YcYq ppJmKQrRnjJ7tm7Yvu1+fQqgucM7xW9ORF5CExDW1NkdqKdmmH3BGTq7jdcxNx+/ZZKT jDy4mMXOmId8uTdxSBraeQ71LfmdsC9UoxkfShdIRyf1V0heuu3TinKZQVLPIdANVTB2 qamg== 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=rfUrH6hwPhZlZJRuY17GMzM0HULluXlF2QevGochjOA=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=ROzTeQAEyx50Liax1UBRVmcdse+R4t9TJLaWGisV+7jJHtiOFOInZYERx0BaTpgEr5 0uHzvAawEsm/xH3Pm2ji1De1VkDgxlp8YYRp/BwGL0ZQzRONcddQ6A1Qv0KPJ5NdXV32 Fu2TMIHi4AF1U2Uy0VFcNSy88tCxqBQpndRJZ0qDJfAwleK8eRLT2WxzShLCDFZE7UiV SoQAqT6kgYid7QnJe79de+VEDJp6b8QiU7toDIHekJLK5E9h5unrsUeqCaIWLM8gq2wr yw/l0wX+E6RFpuEc4myM6NxPb0i+HRYolzPbZ7JhESfJkbNWQLfr31ZUwMswSsvP2MJd 415A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=BkxdwsQw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id d12-20020a170902c18c00b001bb20380bf9si7155674pld.545.2023.11.14.00.47.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:47:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=BkxdwsQw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 48BFE8065016; Tue, 14 Nov 2023 00:46:15 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232525AbjKNIqD (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232405AbjKNIps (ORCPT ); Tue, 14 Nov 2023 03:45:48 -0500 Received: from mail-yw1-x1130.google.com (mail-yw1-x1130.google.com [IPv6:2607:f8b0:4864:20::1130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B944C1AD; Tue, 14 Nov 2023 00:45:44 -0800 (PST) Received: by mail-yw1-x1130.google.com with SMTP id 00721157ae682-5afabb23900so63206207b3.2; Tue, 14 Nov 2023 00:45:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951544; x=1700556344; 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=rfUrH6hwPhZlZJRuY17GMzM0HULluXlF2QevGochjOA=; b=BkxdwsQwRcYbShhOtRv0AxGFEAHK4dW7zEmWACZ75xWSPdHR4GEhACvQiK4MU9arNo JkJaXKRT8LhNhJEbonborEGDP0QFQi4FAXpDzmv+e5gCWdP4FfslfzA4aJy7PAfl74eW TedLMqKpIYvzavYi04EUZ4g+Huql3o/w+AUp1CRpr+xeZ+1ubUmVH9z3qNLVNeJsctXv T5EhTPVNjMinAZkZMOveG0q6wYZXXZw2ejvPuy4crk+MSlTDne3Et/3jo2H1GGm4IbiQ M3EstK1s+8sH56gV/f6nHa1xy3Bz2aqVuZLXNn1kYPdHSgqA7u2Iu/pgrCyBsYk5Bc7O lTPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951544; x=1700556344; 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=rfUrH6hwPhZlZJRuY17GMzM0HULluXlF2QevGochjOA=; b=jFGiXXbFcLs4qpBRkXP5v/ME29g/Ts66fdB0w+a/JxIxWq45x34lYGTer78e++CjuV LG4eFEa7awNyU+z6N0IzeDpRpAd7SUSOpl1TvZDY9E2I42MMuXdo3ZZizhT2778PuK1n bESjENvumHx+WCUWQS1eHRUu+gAzEw4GPUAZ78G3n/XXhlnwkL2QoeXDdBZearp4WZNO jZS9JkvBlMmhZaCvzpycHx961/LE9miuo0k8q3vc7o+3mV3MpC2pd5LFH7neAVzZw8iO ED2x+JoKMb1kEC2RIISR0xJcM1v1LJRRoBnF6O788QMz+h1q0Q+SX3SyNLdzGt5C9UMr yF2A== X-Gm-Message-State: AOJu0YxRhXzH7M8klpuvtqHuz7axpBh0ydCGMlHArlE7pKmSLhA4qOZI J94PgryMztji944QM9MHY4BQ9TeC834= X-Received: by 2002:a81:528d:0:b0:59f:b0d9:5df2 with SMTP id g135-20020a81528d000000b0059fb0d95df2mr9635510ywb.0.1699951543778; Tue, 14 Nov 2023 00:45:43 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:43 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 06/20] nilfs2: Convert nilfs_writepage() to use a folio Date: Tue, 14 Nov 2023 17:44:22 +0900 Message-Id: <20231114084436.2755-7-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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:46:15 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528520649388286 X-GMAIL-MSGID: 1782528520649388286 From: "Matthew Wilcox (Oracle)" Convert the incoming page to a folio. Replaces three calls to compound_head() with one. Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/inode.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index f861f3a0bf5c..c7ec56358a79 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -175,7 +175,8 @@ static int nilfs_writepages(struct address_space *mapping, static int nilfs_writepage(struct page *page, struct writeback_control *wbc) { - struct inode *inode = page->mapping->host; + struct folio *folio = page_folio(page); + struct inode *inode = folio->mapping->host; int err; if (sb_rdonly(inode->i_sb)) { @@ -186,12 +187,12 @@ static int nilfs_writepage(struct page *page, struct writeback_control *wbc) * So, here we simply discard this dirty page. */ nilfs_clear_dirty_page(page, false); - unlock_page(page); + folio_unlock(folio); return -EROFS; } - redirty_page_for_writepage(wbc, page); - unlock_page(page); + folio_redirty_for_writepage(wbc, folio); + folio_unlock(folio); if (wbc->sync_mode == WB_SYNC_ALL) { err = nilfs_construct_segment(inode->i_sb); From patchwork Tue Nov 14 08:44:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164764 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727798vqg; Tue, 14 Nov 2023 00:47:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IEoosiMm7LNji2QbOnDKQQBe+npexR3SMgYG/EAvnn5HEiQkEyT9Vi+ubowg0g2jp/Wg49w X-Received: by 2002:a05:6870:4e0c:b0:1f4:88cd:5ee3 with SMTP id pl12-20020a0568704e0c00b001f488cd5ee3mr13118259oab.27.1699951670398; Tue, 14 Nov 2023 00:47:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951670; cv=none; d=google.com; s=arc-20160816; b=EpnHp2VnYjz8O+HyoklWrOQop1+DTBeiEOScD9LPehZT53cqCaTEvBW+OYQlIU44gZ lzebFQntgahYI3ZiABumouR899AuZior89jMXS/5zShCTk0r9E371n8gqEY/q3tIQH0d Bg8b28gqZ9b0BLBmnPpDdhJvqFUQOVK92PF+/hdo7sDgxovKqSrzvZsEpci1Dn3CWe9f jUNBo72KmNUaP7sI54z/dNNvtChHf/nnzWiYXTe8uh+tJq45gPM3Wk6ANd4bZTFsPD6G RRiyoQi1Hc3k479u7E6aX6gS0T2FTnC7aSjIBvaMiplMMvdzlMuIK16bYVO5X2fRt85x sfpg== 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=DYBrKD//Fwh/NYZY8hEC83Yv0uKXYu3iL+h8zoNblA8=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=rPTGH7uJhPxeLyhU3gmwWF3y8/EFN3M6ebD2kA50yQTh8kvLrA9rpw+lVf9J82mSPW 9uMCXE9K0ZfFV/AnmhN0EGzKn5NLuiZHRn3AJiw4Hi3DB/uBg4e5b01vM3I9CPG6RBMT mqru8qt+a/Kzg6AybdWmOJE+viGGMDilh248g8aulHSwWxjHQd3/R4MHmph6AKZDzfaN 54yC+9lcl7DKkya6p1d2s9s/0kEuRuXtCvkjECgAfMUJhiAZwzjEmmG9qDWNbKIf5r2+ H72s2ez4BstPTdVAJHfpyiNBPe5f4BhXMD+rVsQM+GZD4KXm8X9HsK353JcyhZPCnECf ZJCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jSiuoen5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id b6-20020a056a000a8600b006b6efb7f99fsi7845483pfl.280.2023.11.14.00.47.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:47:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jSiuoen5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 04F868095026; Tue, 14 Nov 2023 00:46:25 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232546AbjKNIqH (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232395AbjKNIpu (ORCPT ); Tue, 14 Nov 2023 03:45:50 -0500 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 336E0D4D; Tue, 14 Nov 2023 00:45:46 -0800 (PST) Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-6c34e87b571so4448529b3a.3; Tue, 14 Nov 2023 00:45:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951545; x=1700556345; 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=DYBrKD//Fwh/NYZY8hEC83Yv0uKXYu3iL+h8zoNblA8=; b=jSiuoen5cbGc0b5p0FsLgVqL1+1WNb3Wo8lERYUAY0YW1kOulucBZNJLZuanBdo4mu 2N2rP7SvfV8x0/PKR9I+s9gnUWQ99g/Wi1P1z9dyQ+SXjrke5+DiV7x+yk+QWvj0Edsi vmYOpQbSBVRO0rwa5EDq37+6slPRVPbRA5ZcYsBx3mPNBopRu5JlfYCyf60n4nsZKvXz qW0sa0t5/7gs8gDMLS2/sDHJMMQhTF05oTGiSOtZ+gccBAGT6tNCVR6uuYL+XCekT+Pg ndaRsKyJco3yK4Do0n4TalSV2TP4XhRTdwau9GPF32agpWnbhPkf6eBWQYcb5cZOZfqa 3viA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951545; x=1700556345; 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=DYBrKD//Fwh/NYZY8hEC83Yv0uKXYu3iL+h8zoNblA8=; b=pAGgANwa99GBn0+/eXRNgmBbqzJftAK6I6CQAOPP8cA/SIIi8UCitHI1E7MVTbyvq7 S6LJ/mQcmf3mC9Z7UFq+Z9klxgMq1I+kolyl5v8PH7AURcsBeGIf26oWqIj6BJSlsaoN OqFYSPAkV/L5t1y5Yu3izmyjc0ehjiyuCxR2EB/x0IZKwlQh0WA2PrIbpcKrwQY2N/2s d7/aOfgyAL2nxa9hxkk8ixpLLLbSu1rs8dHDcWdMnLYznxdSSB582pXlZwClfHvAz1C0 tZG400kvoXASY5vjBU0YPLZRUPng5jC5rS2D9N3MbpaUM+cMMgaUMxU+deyQqG+7q8kD lsiQ== X-Gm-Message-State: AOJu0YxLwIAYarhbPmPCtHWELWUq8q5Ry27U1+W9v3j4VYioDpGxJStO gZi2Z5QKzFgSdC4T9p+CPpg= X-Received: by 2002:a05:6a00:230f:b0:6be:22db:7a13 with SMTP id h15-20020a056a00230f00b006be22db7a13mr8655258pfh.25.1699951545636; Tue, 14 Nov 2023 00:45:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:45 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 07/20] nilfs2: Convert nilfs_mdt_write_page() to use a folio Date: Tue, 14 Nov 2023 17:44:23 +0900 Message-Id: <20231114084436.2755-8-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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:46:25 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528523025322089 X-GMAIL-MSGID: 1782528523025322089 From: "Matthew Wilcox (Oracle)" Convert the incoming page to a folio. Replaces three calls to compound_head() with one. Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/mdt.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c index c97c77a39668..327408512b86 100644 --- a/fs/nilfs2/mdt.c +++ b/fs/nilfs2/mdt.c @@ -399,7 +399,8 @@ int nilfs_mdt_fetch_dirty(struct inode *inode) static int nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc) { - struct inode *inode = page->mapping->host; + struct folio *folio = page_folio(page); + struct inode *inode = folio->mapping->host; struct super_block *sb; int err = 0; @@ -407,16 +408,16 @@ nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc) /* * It means that filesystem was remounted in read-only * mode because of error or metadata corruption. But we - * have dirty pages that try to be flushed in background. - * So, here we simply discard this dirty page. + * have dirty folios that try to be flushed in background. + * So, here we simply discard this dirty folio. */ nilfs_clear_dirty_page(page, false); - unlock_page(page); + folio_unlock(folio); return -EROFS; } - redirty_page_for_writepage(wbc, page); - unlock_page(page); + folio_redirty_for_writepage(wbc, folio); + folio_unlock(folio); if (!inode) return 0; From patchwork Tue Nov 14 08:44:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164758 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727393vqg; Tue, 14 Nov 2023 00:46:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IFJKA5s2ztJkoyAhT5TA+kww+JR37rq2eIN9dxmVbkf1yWypiWWLfb1R6iq6O43acTScsP6 X-Received: by 2002:a05:6358:52ce:b0:16b:c486:c315 with SMTP id z14-20020a05635852ce00b0016bc486c315mr2351765rwz.3.1699951602494; Tue, 14 Nov 2023 00:46:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951602; cv=none; d=google.com; s=arc-20160816; b=fGfBbHZPvsiNdhwA0PBLeLlvF9b/NHONyEH7DryaJIdlyl22aLVh5Ha712cEsc04ZL 7BFULApBUdQLcfIkU9KdZcSe1tpX9828Wuq+MqJZhtr1w2v6nxJTNFH2FQMstV1p/cD1 z7N+8vSDaSe8iGDOhsLoIb29ldqiB69QQ5xlDPUpO2jSEE0UeRAvDt8qwgqZV1VKZqZM gp2GUW/Ce52XyHDMVm9ORbwy/nxF3h6wW/Pe9B3dDGGKhxkXu4Dcxs4465/FFDKHiUsv NfSYNg2OT1dpAtT1YDfKinZX8ykUQwqqmMwQwcCL96ouC5QZxz7j3sA3Wg3dqj3mIRyh xgfg== 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=WUc6IRzVdejbAHWCvNS1DFPLv9TAp+unQ6jPhpK5S64=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=g8G16u+Hlwh0zgVjRP/kIsbjMumFWiJvj08y6oST2nxyypKHe4fM9EKsH5/emquMRD uo+a1RO91tIH2nR7AI6J/dgNyEqbfKlT8ZYG9d2NDZ9mzjEYA2sCG81QggZbisY8AGVn fwNHo8n76rEHeXk3M4ZOX3tr/qAUEHva8ZBMfP21X4qbrwoQoHFQCkpx82SSO6gZNHPX VCpiKUzrO7CNdXxibqzcLD3wxhvFfCEu7KnV9Nse3Mj3AHYXA/10X5YdrSfEb7Px5bYF zxXyUlPkooA+l9E6ULloEafKUPWEpu0pI7rWAWHevMADnS6JjXbUynNPIl87aOjMn/Xk qeMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="hUKxY5/O"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id ca8-20020a056a02068800b005be1ee5c3f2si7940120pgb.289.2023.11.14.00.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:46:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="hUKxY5/O"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id 8EAEC804195E; Tue, 14 Nov 2023 00:46:33 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232554AbjKNIqL (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232456AbjKNIpv (ORCPT ); Tue, 14 Nov 2023 03:45:51 -0500 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A9D91AD; Tue, 14 Nov 2023 00:45:48 -0800 (PST) Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-6b5af4662b7so4629386b3a.3; Tue, 14 Nov 2023 00:45:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951547; x=1700556347; 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=WUc6IRzVdejbAHWCvNS1DFPLv9TAp+unQ6jPhpK5S64=; b=hUKxY5/OgRrTXw/KCmZeF/G5rcb4n9ND9bIYNq3XvJohw4B1RMU2daSOkWNYBI/98/ JlkMjjr7cw6Pgd0SKSamAwr9RlF5Esqnv+7KpLcJRS9UTW6tBbIsRlwrjjtSAAvwyyyt kjTbJ0hRF8EQ0Vr9/uXOhpmpGDEYUs2bx/mtCUIsvwM7sk+SlNBF2EN2efqwbDLISlyk pWQyheN/eantQaSHQKCXiJHqN/oBy989ZaT1//bEyxnnl3GsQff4nseQRWZz/vi+IAxl s4poLMHCX16bAyxQ5N7XYN+NWPM6X4dsDRx/MLZrr1DpxWhiNUD60i+ImJlBSpgDngfY Nk7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951547; x=1700556347; 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=WUc6IRzVdejbAHWCvNS1DFPLv9TAp+unQ6jPhpK5S64=; b=YHdKQvTfyVmM/BGA7izGKKxk+mMuCFTR6HDH7yV6ljcB1tffcJpLhjaUZjOe4EZCjg CLBVfycmbjyjFY6pdwz3+MKYNZnDgto5f11PSWXzaWlgnzXzMJPC9wyDvvT7g9T/nTCE NCkPOexpmy7/sj2unhZYbXL7ZJsNhdKAPa6pgEJeljnLaN/DjxDQFOoswy5e592nIF4D GvlWw7QiBv4H4NhCix380t7qJiv4lqpoN+oJjMVlLh0RbcF73Hw93/IFJSeHUWapUAnq KcG7KphXPor2LHcHi/zH+xIBH5FMuJ3u0ze5EADZIHt43QEYO3/DTirBp7bCYRMIqWDn Yj2Q== X-Gm-Message-State: AOJu0Yw3yO0RjF5AvBx/mv+zzYRsu75MgzdMskRovlhcQmprvhogW+wV 6Pvl8i9pBXoEOZJBtya+ZqiNRrxH2TY= X-Received: by 2002:a05:6a00:80c9:b0:68e:41e9:10be with SMTP id ei9-20020a056a0080c900b0068e41e910bemr5574881pfb.20.1699951547518; Tue, 14 Nov 2023 00:45:47 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:47 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 08/20] nilfs2: Convert to nilfs_clear_folio_dirty() Date: Tue, 14 Nov 2023 17:44:24 +0900 Message-Id: <20231114084436.2755-9-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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:46:33 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528451339081003 X-GMAIL-MSGID: 1782528451339081003 From: "Matthew Wilcox (Oracle)" All callers of nilfs_clear_dirty_page() now have a folio, so rename the function and pass in the folio. Saves three hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/inode.c | 2 +- fs/nilfs2/mdt.c | 2 +- fs/nilfs2/page.c | 27 ++++++++++++++------------- fs/nilfs2/page.h | 2 +- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index c7ec56358a79..8fe784f62720 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -186,7 +186,7 @@ static int nilfs_writepage(struct page *page, struct writeback_control *wbc) * have dirty pages that try to be flushed in background. * So, here we simply discard this dirty page. */ - nilfs_clear_dirty_page(page, false); + nilfs_clear_folio_dirty(folio, false); folio_unlock(folio); return -EROFS; } diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c index 327408512b86..2e7952ac2f67 100644 --- a/fs/nilfs2/mdt.c +++ b/fs/nilfs2/mdt.c @@ -411,7 +411,7 @@ nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc) * have dirty folios that try to be flushed in background. * So, here we simply discard this dirty folio. */ - nilfs_clear_dirty_page(page, false); + nilfs_clear_folio_dirty(folio, false); folio_unlock(folio); return -EROFS; } diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index 29799a49c234..48a91ff059f5 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c @@ -379,7 +379,7 @@ void nilfs_clear_dirty_pages(struct address_space *mapping, bool silent) * was acquired. Skip processing in that case. */ if (likely(folio->mapping == mapping)) - nilfs_clear_dirty_page(&folio->page, silent); + nilfs_clear_folio_dirty(folio, silent); folio_unlock(folio); } @@ -389,32 +389,33 @@ void nilfs_clear_dirty_pages(struct address_space *mapping, bool silent) } /** - * nilfs_clear_dirty_page - discard dirty page - * @page: dirty page that will be discarded + * nilfs_clear_folio_dirty - discard dirty folio + * @folio: dirty folio that will be discarded * @silent: suppress [true] or print [false] warning messages */ -void nilfs_clear_dirty_page(struct page *page, bool silent) +void nilfs_clear_folio_dirty(struct folio *folio, bool silent) { - struct inode *inode = page->mapping->host; + struct inode *inode = folio->mapping->host; struct super_block *sb = inode->i_sb; + struct buffer_head *bh, *head; - BUG_ON(!PageLocked(page)); + BUG_ON(!folio_test_locked(folio)); if (!silent) nilfs_warn(sb, "discard dirty page: offset=%lld, ino=%lu", - page_offset(page), inode->i_ino); + folio_pos(folio), inode->i_ino); - ClearPageUptodate(page); - ClearPageMappedToDisk(page); + folio_clear_uptodate(folio); + folio_clear_mappedtodisk(folio); - if (page_has_buffers(page)) { - struct buffer_head *bh, *head; + head = folio_buffers(folio); + if (head) { const unsigned long clear_bits = (BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) | BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) | BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected)); - bh = head = page_buffers(page); + bh = head; do { lock_buffer(bh); if (!silent) @@ -427,7 +428,7 @@ void nilfs_clear_dirty_page(struct page *page, bool silent) } while (bh = bh->b_this_page, bh != head); } - __nilfs_clear_page_dirty(page); + __nilfs_clear_page_dirty(&folio->page); } unsigned int nilfs_page_count_clean_buffers(struct page *page, diff --git a/fs/nilfs2/page.h b/fs/nilfs2/page.h index a8ab800e689c..c419bb1f5b7d 100644 --- a/fs/nilfs2/page.h +++ b/fs/nilfs2/page.h @@ -41,7 +41,7 @@ void nilfs_page_bug(struct page *); int nilfs_copy_dirty_pages(struct address_space *, struct address_space *); void nilfs_copy_back_pages(struct address_space *, struct address_space *); -void nilfs_clear_dirty_page(struct page *, bool); +void nilfs_clear_folio_dirty(struct folio *, bool); void nilfs_clear_dirty_pages(struct address_space *, bool); unsigned int nilfs_page_count_clean_buffers(struct page *, unsigned int, unsigned int); From patchwork Tue Nov 14 08:44:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164761 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727684vqg; Tue, 14 Nov 2023 00:47:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IHKFVwATCO9BP4XjAnmMr7CkuFFAvzBCvvwbb4PojG7NyNpBNhlQHiMd/nW7ebk+VyUFNUE X-Received: by 2002:a05:6a20:7286:b0:187:301e:c5a1 with SMTP id o6-20020a056a20728600b00187301ec5a1mr77051pzk.7.1699951650878; Tue, 14 Nov 2023 00:47:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951650; cv=none; d=google.com; s=arc-20160816; b=L7Ix6nIucB9hSXbJ2Ja7MLz0fzWjSxBiIwxMXVhIUFPRGRBekc3Hf/k8EMoe0Myo3E 0zypz630DDrgvvSilKcy/Gr287qHghEIoQBQ8J1ugTvHbC5FTVESODAwFuxt+NC8pY5t haZ6u0OuuNICcyw1Y0aC23s/6N8kwkQAV1SUWaxjwro6ieWBmKZXShP9yWlyqpGnaK++ wrSIn6D3c9udDHM8i1sRERn6yrOWJ9fQTxPieEbPTP71RIm+XsMMT8qYCGJCpakopOkd W8dWI31ekIg9VF3ABUZSR09CCiB9prd/g4uBek+RsQxe3AzsGQ63ouJr/IkDbd+PRcX9 8bkg== 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=ACTke6Zf0OUOc76NPf/lv5o2wBWaGEEAOlcvwIBiVRQ=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=FbGNxUAmXtS30TNbIunjylxtN+8KS7/OlhviR/rC0sIQljETppZZ73U3CelTl69Jvj jJj3u/zkbqYzBil8Z5XACJi20JpeBc5Rl4EqRGBdSunvhM0bb817SxouafzsHS3Hzfow 8rVNz9ueG9XmV5M8VJW53A3nmTiLBZBw+3/IO2xAp/lRKa5xXXGDY0+3hcAKTGwtR77a dR7Ewp6Y0uY0aTTY/YX3irEx8EFN/Iwq1jIbaixYi2uXj8nWp7s4blz/y7rZvtcgkf7B tnqwJwePsktGM59vFMBLIqyfQMAh+XV0pkQc19shu4Bai2KWhM9KersfUayLO0K5sgzs FRRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kg33XimF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id jf14-20020a170903268e00b001b8922e82e3si7175067plb.297.2023.11.14.00.47.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:47:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kg33XimF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 534808048D84; Tue, 14 Nov 2023 00:47:21 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232421AbjKNIqO (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232440AbjKNIpx (ORCPT ); Tue, 14 Nov 2023 03:45:53 -0500 Received: from mail-oo1-xc31.google.com (mail-oo1-xc31.google.com [IPv6:2607:f8b0:4864:20::c31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B60DD5F; Tue, 14 Nov 2023 00:45:50 -0800 (PST) Received: by mail-oo1-xc31.google.com with SMTP id 006d021491bc7-586b512ba0aso2407881eaf.3; Tue, 14 Nov 2023 00:45:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951549; x=1700556349; 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=ACTke6Zf0OUOc76NPf/lv5o2wBWaGEEAOlcvwIBiVRQ=; b=kg33XimFsbH2RExCawortrrH665/l1gaORpGq0UYPOKDAePT4/BQhJO4C79TT7ONfL 3VpTMl9s2En8lfFFTWGfb9Ns9HNiRfitEqPhMrXyBqXhzO5zILVvthu359qcRCFgHE7R FPGMlKatbMSRaK2Liob/gVKZ7PV5bl0we3Pfy4uugedjvud6LyKUTJ8gh1adeZf8rCgJ pfV3lST+vzMlFABJURF6o3ShDvjjZDLjvHuGDwbkqxS6SzxyOuZ9PfATCV5glye62Deb Bvqt1JoMf+/7sSmjfa1dmLaGbU8dy2pa+80aZL/LLru2nMbSPGsZ6jfbZ1s3SfBjPlb2 8Ufg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951549; x=1700556349; 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=ACTke6Zf0OUOc76NPf/lv5o2wBWaGEEAOlcvwIBiVRQ=; b=s39POC/ujzeoJsus9Q1gfU9yJfnfy7kDPZuv02leT86kfcieg0OxRbCYU3FQ+lQaxh 5c5LnCPFicepKRN6uot5iMQGjzvNWHGOef8qWsc5acNmg3tWVks2Gxo/ZIyZ3OgSZqv4 iJZYyRHRFlT3d/zSN633RA90E39VMp+qEV8X7nUOTFOmyd3qMHKKKjeWMlHBP3Nb3qln S8VHZBw12w6Mae0eSmVGlARPaPlYzvxf0ws0xokgJbLtNPG6cG2M2lEMc6TbTWqBsDUD bwYfJNLv78B/Pn2E1fIR85YQ05NFXqcrMjrFsAp5sdno2FF53/GgIl52voCpduwDzYWE hXIw== X-Gm-Message-State: AOJu0YxJzQKq552Q8qAuFRfcHJkXfYQEcuOWF3bMlC0L1ITbhb3lyJ/8 pSV+0cjKSDVbQrP6vWVyY/PlRDZUS4c= X-Received: by 2002:a05:6870:498b:b0:1f0:a639:49a1 with SMTP id ho11-20020a056870498b00b001f0a63949a1mr8791524oab.15.1699951549432; Tue, 14 Nov 2023 00:45:49 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:48 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 09/20] nilfs2: Convert to __nilfs_clear_folio_dirty() Date: Tue, 14 Nov 2023 17:44:25 +0900 Message-Id: <20231114084436.2755-10-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 agentk.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 (agentk.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:47:21 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528502403872064 X-GMAIL-MSGID: 1782528502403872064 From: "Matthew Wilcox (Oracle)" All callers now have a folio, so convert to pass a folio. No caller uses the return value, so make it return void. Removes a couple of hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/page.c | 19 ++++++++++--------- fs/nilfs2/page.h | 2 +- fs/nilfs2/segment.c | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index 48a91ff059f5..94e11bcee05b 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c @@ -82,7 +82,7 @@ void nilfs_forget_buffer(struct buffer_head *bh) lock_buffer(bh); set_mask_bits(&bh->b_state, clear_bits, 0); if (nilfs_folio_buffers_clean(folio)) - __nilfs_clear_page_dirty(&folio->page); + __nilfs_clear_folio_dirty(folio); bh->b_blocknr = -1; folio_clear_uptodate(folio); @@ -428,7 +428,7 @@ void nilfs_clear_folio_dirty(struct folio *folio, bool silent) } while (bh = bh->b_this_page, bh != head); } - __nilfs_clear_page_dirty(&folio->page); + __nilfs_clear_folio_dirty(folio); } unsigned int nilfs_page_count_clean_buffers(struct page *page, @@ -458,22 +458,23 @@ unsigned int nilfs_page_count_clean_buffers(struct page *page, * 2) Some B-tree operations like insertion or deletion may dispose buffers * in dirty state, and this needs to cancel the dirty state of their pages. */ -int __nilfs_clear_page_dirty(struct page *page) +void __nilfs_clear_folio_dirty(struct folio *folio) { - struct address_space *mapping = page->mapping; + struct address_space *mapping = folio->mapping; if (mapping) { xa_lock_irq(&mapping->i_pages); - if (test_bit(PG_dirty, &page->flags)) { - __xa_clear_mark(&mapping->i_pages, page_index(page), + if (folio_test_dirty(folio)) { + __xa_clear_mark(&mapping->i_pages, folio->index, PAGECACHE_TAG_DIRTY); xa_unlock_irq(&mapping->i_pages); - return clear_page_dirty_for_io(page); + folio_clear_dirty_for_io(folio); + return; } xa_unlock_irq(&mapping->i_pages); - return 0; + return; } - return TestClearPageDirty(page); + folio_clear_dirty(folio); } /** diff --git a/fs/nilfs2/page.h b/fs/nilfs2/page.h index c419bb1f5b7d..968b311d265b 100644 --- a/fs/nilfs2/page.h +++ b/fs/nilfs2/page.h @@ -30,7 +30,7 @@ BUFFER_FNS(NILFS_Checked, nilfs_checked) /* buffer is verified */ BUFFER_FNS(NILFS_Redirected, nilfs_redirected) /* redirected to a copy */ -int __nilfs_clear_page_dirty(struct page *); +void __nilfs_clear_folio_dirty(struct folio *); struct buffer_head *nilfs_grab_buffer(struct inode *, struct address_space *, unsigned long, unsigned long); diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 888b8606a1e8..8c675c118c66 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -1760,7 +1760,7 @@ static void nilfs_end_folio_io(struct folio *folio, int err) */ folio_lock(folio); if (nilfs_folio_buffers_clean(folio)) - __nilfs_clear_page_dirty(&folio->page); + __nilfs_clear_folio_dirty(folio); folio_unlock(folio); } return; From patchwork Tue Nov 14 08:44:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164765 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727822vqg; Tue, 14 Nov 2023 00:47:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IHlKOW80UlAmN7n2shfEypR56ETCRdwOP3NatvaZ2yeU/93oVPgwDu3Pza+GUmGGBjw8fHI X-Received: by 2002:a05:6358:338c:b0:16b:a9f5:cde0 with SMTP id i12-20020a056358338c00b0016ba9f5cde0mr2189254rwd.29.1699951674607; Tue, 14 Nov 2023 00:47:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951674; cv=none; d=google.com; s=arc-20160816; b=JAmk7HN1+67vKl42/m/sknecFm1eGOD814e+bTe7IYRBgdn/1xGMIhSWhdjhEwhyiT zSckZcSH2fmkq1ONb6H5J6QBDCb5aBW0EZvq5lmVS2fpp7k4jIZ0NIVIW9ir1+EsKt4L MNLsW/fIiQVT8iea/5x7PxXQ5rtpy+9ds5C8A4Nv4yVsmFmVwyBIuqdp5FN2X9L0TXeX DwmdVhdOJcKLLGLbHI4WACLzNW+STlrRWU6DyN/LM2IiKD+lECOc0q08SXLvyl2x2YhX pzoxNVhhNrxNKAjmklOwYqOvjh6Osz0NG8PzHK7sVx1J5OfSlA6ABv2wOcI41cb9rtxI WLfQ== 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=EviPGa1LuLnC0+KfNNg7CsK+qd6t9X5DweSPa1hqKSw=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=lEBIeLIvFOjd+7L5p9Y4ygYClpHAlfxrN96rNxojdQ5hHaBLovMLyq3003GSE52i3b G8/XJUysWv45riumSLPJ7El1qXtrdo4l0UzKwrJfmxU8UTgiSQEJcu55Wu/jsJZQQP3j KBZIPZjUfmxvHNW9RE1tGiC1qJV8x9XpwwWbezUj2S83vRrE8kI2rIuYyIssFW5qWhc7 r2irayqKkyqN4veJKFm1jH5QuCQ2fzOp/lzQ0nkrrhWaEUOI5Hb/iZAyDGIxLmtnIrAZ V/K5XM/6tW1rgnXQOlw5D1XXdwbup5X4EpCr/4vV+aKcUAICBtE0btu2D6r8/is2a12E PmMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nfaNMqe2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id z9-20020a655a49000000b005b90af1943asi7828212pgs.807.2023.11.14.00.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:47:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nfaNMqe2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id A09E48072A24; Tue, 14 Nov 2023 00:47:31 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232570AbjKNIqR (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232498AbjKNIqB (ORCPT ); Tue, 14 Nov 2023 03:46:01 -0500 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32B41A4; Tue, 14 Nov 2023 00:45:51 -0800 (PST) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6bee11456baso4572438b3a.1; Tue, 14 Nov 2023 00:45:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951551; x=1700556351; 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=EviPGa1LuLnC0+KfNNg7CsK+qd6t9X5DweSPa1hqKSw=; b=nfaNMqe2ce7ZdK9sMCxgmLjRywnB0lFVHldlnrAe8+qaMg1sIgxRtwjutw+lU1pt+N ydrdGY6bTudLyqjXBnMoM2KHisnfSCpFF5uItaWDQHsL7laicwgaFxjK5NXKnx2YQGVa VGR6O+BzQ5KXsFJHaAfDKmlESDw8Mm/4S05+S3dUJtacxQnm6cPDcAVzSj23FDTv8eXL AH80PqtQpfZsg9mIV9zOB6ff1E0o3qsopkYy2maQDUpDDX6cMS0bvk98NWh3kSaSL/sO tH40xfNdCcQPGcx2GieZdXisv+lxbvXOC6++TLS3gj3x0H3IuMf1f9etwUQr9I8kNDNT BC9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951551; x=1700556351; 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=EviPGa1LuLnC0+KfNNg7CsK+qd6t9X5DweSPa1hqKSw=; b=Il3NK1V4YbIYqj9TD85AWVRIvKfzjhrpHumedAyma27vvJlMobyoKSBu0Ni/1DL9mm hlyHiw3YuvPAY4PnqiVyp7zMt1T3BIeOyVHXVjxQvmvPMbXIMdKq9O0R7LPuTJFKoD59 KTj2Dm8PzZAwBnRPt6El+B7YGF/ysbdDLqqNxOAPtKTgOAabwK3VSvslwYUYMIaRtmoV iqBf2l8cu/jXIfwDW4Ejp0Piew/4oMA9rWFkiRHogK+jQsr8Q626ifui3DpI7BlAhga/ xrDMoXuxrd6XKOBaFGxZiM80pTpZZfvpYVr86WHoUq6SYqldcTTQQ2zUJe/5nAwjaCdj afXw== X-Gm-Message-State: AOJu0YwlnxEg4dXd1z3su2t/BuRqzOlyV4b5tiaPL/wAH9BC/wadpgam 2M7OqjKwVpqaofs9jEVdggzyYSqODkM= X-Received: by 2002:aa7:8184:0:b0:68e:496a:7854 with SMTP id g4-20020aa78184000000b0068e496a7854mr5991985pfi.18.1699951551295; Tue, 14 Nov 2023 00:45:51 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:50 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 10/20] nilfs2: Convert nilfs_segctor_prepare_write to use folios Date: Tue, 14 Nov 2023 17:44:26 +0900 Message-Id: <20231114084436.2755-11-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 groat.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 (groat.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:47:31 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528527152566020 X-GMAIL-MSGID: 1782528527152566020 From: "Matthew Wilcox (Oracle)" Use the new folio APIs, saving 17 hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/segment.c | 58 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 8c675c118c66..52995838f2de 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -1665,39 +1665,39 @@ static int nilfs_segctor_assign(struct nilfs_sc_info *sci, int mode) return 0; } -static void nilfs_begin_page_io(struct page *page) +static void nilfs_begin_folio_io(struct folio *folio) { - if (!page || PageWriteback(page)) + if (!folio || folio_test_writeback(folio)) /* * For split b-tree node pages, this function may be called * twice. We ignore the 2nd or later calls by this check. */ return; - lock_page(page); - clear_page_dirty_for_io(page); - set_page_writeback(page); - unlock_page(page); + folio_lock(folio); + folio_clear_dirty_for_io(folio); + folio_start_writeback(folio); + folio_unlock(folio); } static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci) { struct nilfs_segment_buffer *segbuf; - struct page *bd_page = NULL, *fs_page = NULL; + struct folio *bd_folio = NULL, *fs_folio = NULL; list_for_each_entry(segbuf, &sci->sc_segbufs, sb_list) { struct buffer_head *bh; list_for_each_entry(bh, &segbuf->sb_segsum_buffers, b_assoc_buffers) { - if (bh->b_page != bd_page) { - if (bd_page) { - lock_page(bd_page); - clear_page_dirty_for_io(bd_page); - set_page_writeback(bd_page); - unlock_page(bd_page); + if (bh->b_folio != bd_folio) { + if (bd_folio) { + folio_lock(bd_folio); + folio_clear_dirty_for_io(bd_folio); + folio_start_writeback(bd_folio); + folio_unlock(bd_folio); } - bd_page = bh->b_page; + bd_folio = bh->b_folio; } } @@ -1705,28 +1705,28 @@ static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci) b_assoc_buffers) { set_buffer_async_write(bh); if (bh == segbuf->sb_super_root) { - if (bh->b_page != bd_page) { - lock_page(bd_page); - clear_page_dirty_for_io(bd_page); - set_page_writeback(bd_page); - unlock_page(bd_page); - bd_page = bh->b_page; + if (bh->b_folio != bd_folio) { + folio_lock(bd_folio); + folio_clear_dirty_for_io(bd_folio); + folio_start_writeback(bd_folio); + folio_unlock(bd_folio); + bd_folio = bh->b_folio; } break; } - if (bh->b_page != fs_page) { - nilfs_begin_page_io(fs_page); - fs_page = bh->b_page; + if (bh->b_folio != fs_folio) { + nilfs_begin_folio_io(fs_folio); + fs_folio = bh->b_folio; } } } - if (bd_page) { - lock_page(bd_page); - clear_page_dirty_for_io(bd_page); - set_page_writeback(bd_page); - unlock_page(bd_page); + if (bd_folio) { + folio_lock(bd_folio); + folio_clear_dirty_for_io(bd_folio); + folio_start_writeback(bd_folio); + folio_unlock(bd_folio); } - nilfs_begin_page_io(fs_page); + nilfs_begin_folio_io(fs_folio); } static int nilfs_segctor_write(struct nilfs_sc_info *sci, From patchwork Tue Nov 14 08:44:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164767 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727832vqg; Tue, 14 Nov 2023 00:47:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IHXEKQZLox7AigbbBT3yrtxn8iu+DmlZi5F0WXphAIYeClIdSnQGKrK9883gHSUsa0kwEdw X-Received: by 2002:a17:902:ea10:b0:1cc:4402:9e7c with SMTP id s16-20020a170902ea1000b001cc44029e7cmr2124731plg.15.1699951675540; Tue, 14 Nov 2023 00:47:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951675; cv=none; d=google.com; s=arc-20160816; b=NmpycjVsFSXTM9QJ+K2eg5j4c11F1dFr2MYqdxR3e7O6Stv/TsFtwF+oOfSbHPOz9+ 5pdAWLW9xDDbXrFaMuA4Rck8WTNbsX2ANp72IdEpDCR2VbA45VpZrCXU55kF8oroVyer zZqPg27CwpTMuUma9mRz9dvyLIlsNj3RRwO9G6wpReQwoRCZVMmCGozSaTiDQW0T+IQ8 4AjCqpBp6uhFFeQEMaOLqp78vujRxnO4ZkB+7aYyeV+df+gXZFLmmfhYsVBspkD4UVyT P1sPlZ4oGjuXLeONEw8YnwuY7W4CBOBnmfp7/0kT6A/oXv6B4M1v1IEgJ5709Mfw4FMC Rdzg== 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=umby/gWaD1NG+I+nr3l0/ZqYcII4I1MQz6hPgggA34k=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=NEMPbdDyu3TVcYJhkYYrsPVWPCw2KiBeTONVP4uKxgirWlRwiFtPUhZw7J2HUGzjuD FwF0VeOheIA6Occj4iR88fJd2ya1C0qlgcaZ/8n7QmaQXQjwCDBRxnKGdRiLfOUMAIBl V/R3E8qKTaSWzIXpT7gOL5c/SETjySg/Qq80+a46gcxodmBeWuyS4Q09lYrc50J5prOY MOoCYsT4W2qbyIjMlRjBE9ZIzbik/YNLaE7wnUgiI5hMLJpt5E9hdxqBobEzsIMlUNaI WP9tvflebuLFjtHnaGb0s2myHZ4SKUHolccNNqpTRJdye+cha6c8Cxk3M28uHG6Nhoto efJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=exrJ6969; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id o12-20020a170902bccc00b001c9daca280esi7152531pls.235.2023.11.14.00.47.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:47:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=exrJ6969; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 3532280A22F8; Tue, 14 Nov 2023 00:46:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232469AbjKNIqa (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232465AbjKNIqB (ORCPT ); Tue, 14 Nov 2023 03:46:01 -0500 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3AB71702; Tue, 14 Nov 2023 00:45:53 -0800 (PST) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6b77ab73c6fso4142832b3a.1; Tue, 14 Nov 2023 00:45:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951553; x=1700556353; 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=umby/gWaD1NG+I+nr3l0/ZqYcII4I1MQz6hPgggA34k=; b=exrJ6969GK5Ej3rCN3aS9kX3Dm+Nr/RF3WauIv/kegCBXUq4KScwG6C2runr1pc7XF qdyPnOlA+3Weo/KMnsYMMpAIWGfnDJCDeBfq47z1WQwxKElVHr+rokpjl8b/C+Nk9WxB mMjeGQBEts7krWw+hVGKQtXRO+xlOgieWD6AsmfqnOtoQjbv+jNhslxaEFdRi7jpNcvz l5h5+XaR5KyilJs18/k0clj5Ao3CBQrUM/VjDL0SjhuEmvBUgl9iCxu7mMp7zistTaTM AZpuLWGgJDtUjXighP69VLAcCf11uSd/g5cVm9nUMH544iocpEluGKA5xyLEd+XsVo9h do0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951553; x=1700556353; 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=umby/gWaD1NG+I+nr3l0/ZqYcII4I1MQz6hPgggA34k=; b=ZvpLvMkq5Tayc6n+1L3HZLa5A7KMIL7bjsASs+IYjULu83aTM26IaunCHGicLo+GDa kFA2t3WF5vKSfiMdKUWqNFGndPTZzGotv+c+sDBI+pG/jUoj4kzc6Ht/Dwupo0oSSlFg OeJwtnxJ9oJKjB/qD6+f0m6NiPhELYmas82CI4BONv/pYcRbULp4+gTSBB6NpDWkt3G4 VsupppJkm5zPeA5kj6yazyolOurmaPwSb6XStoy1Q8Po3c7RYhHAlEG4RZzx9VViY+ll CEXZe/C8/h9oqnYnppZhQdyoYpQLwlaWuerY89nY+AbLHmC9rl720iiNrvHJo/EluFJc 8pFA== X-Gm-Message-State: AOJu0YycTdelT55Z/jRbCwjwk5aASzH6gerYmElA4MXdD7vvBEs9rfpd +fkYuv7kGmUuUAMsHw2yuesOm0D+xeI= X-Received: by 2002:a05:6a20:9387:b0:17e:aa00:ca62 with SMTP id x7-20020a056a20938700b0017eaa00ca62mr2258319pzh.17.1699951553184; Tue, 14 Nov 2023 00:45:53 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:52 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 11/20] nilfs2: Convert nilfs_page_mkwrite() to use a folio Date: Tue, 14 Nov 2023 17:44:27 +0900 Message-Id: <20231114084436.2755-12-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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:46:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528528471644135 X-GMAIL-MSGID: 1782528528471644135 From: "Matthew Wilcox (Oracle)" Using the new folio APIs saves seven hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/file.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c index 740ce26d1e76..bec33b89a075 100644 --- a/fs/nilfs2/file.c +++ b/fs/nilfs2/file.c @@ -45,34 +45,36 @@ int nilfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; - struct page *page = vmf->page; + struct folio *folio = page_folio(vmf->page); struct inode *inode = file_inode(vma->vm_file); struct nilfs_transaction_info ti; + struct buffer_head *bh, *head; int ret = 0; if (unlikely(nilfs_near_disk_full(inode->i_sb->s_fs_info))) return VM_FAULT_SIGBUS; /* -ENOSPC */ sb_start_pagefault(inode->i_sb); - lock_page(page); - if (page->mapping != inode->i_mapping || - page_offset(page) >= i_size_read(inode) || !PageUptodate(page)) { - unlock_page(page); + folio_lock(folio); + if (folio->mapping != inode->i_mapping || + folio_pos(folio) >= i_size_read(inode) || + !folio_test_uptodate(folio)) { + folio_unlock(folio); ret = -EFAULT; /* make the VM retry the fault */ goto out; } /* - * check to see if the page is mapped already (no holes) + * check to see if the folio is mapped already (no holes) */ - if (PageMappedToDisk(page)) + if (folio_test_mappedtodisk(folio)) goto mapped; - if (page_has_buffers(page)) { - struct buffer_head *bh, *head; + head = folio_buffers(folio); + if (head) { int fully_mapped = 1; - bh = head = page_buffers(page); + bh = head; do { if (!buffer_mapped(bh)) { fully_mapped = 0; @@ -81,11 +83,11 @@ static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf) } while (bh = bh->b_this_page, bh != head); if (fully_mapped) { - SetPageMappedToDisk(page); + folio_set_mappedtodisk(folio); goto mapped; } } - unlock_page(page); + folio_unlock(folio); /* * fill hole blocks @@ -105,7 +107,7 @@ static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf) nilfs_transaction_commit(inode->i_sb); mapped: - wait_for_stable_page(page); + folio_wait_stable(folio); out: sb_end_pagefault(inode->i_sb); return vmf_fs_error(ret); From patchwork Tue Nov 14 08:44:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164772 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727931vqg; Tue, 14 Nov 2023 00:48:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IEbQcfkSoApINqvMtazUZcTrMHIL/U+BnQesqLJTKnF2ypqyYODpNLat7/JNsaa+JE1Ferd X-Received: by 2002:a17:902:f814:b0:1cc:cff:43b6 with SMTP id ix20-20020a170902f81400b001cc0cff43b6mr1338942plb.54.1699951686877; Tue, 14 Nov 2023 00:48:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951686; cv=none; d=google.com; s=arc-20160816; b=Eg+qKWjTF+x/HPWk6dCfKYFHCMuQQHoAG5v2oWaCW7mcVfoI9s5Bklg+iB9oWRihy4 yQWiUHmBAPNkjtpJS6tBUO/k2aQk/IxFvuWipQtM7QNZNFfPRPzYY1XALMde/DZZ5JYp By1H3NPrLSviK6PEgD8WPKdA9j49aJETOinTSX1vbSYsqkm6fJvGHKYBKCbkMAY28XXI gIJCYm0mCbQYcbIiw4qS/1cv8G+7gl0rpLxm7kEllrN6/ym0Ybgb6lnVLrYNwqT/7OfD 12TMAySuNdI+6z6dEeKL4fwQcDQwBXcyYkDGJD0LuhNhJtoTDPxHEg0+tZm8i+AdBsBT yFbA== 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=jOfolZFbaeNksDOEbKm+WHbGTOTwNzBMg/acdZEYYm0=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=MkRaBGLZXQA5rrH0vhWj2szUodjUO0bmCwizY4tq8068y85TPjinhwTPOXJ2npVcdN IO9FSOAlf6st2RoUIPH2ZXSdLnXAfl29iRTu9RkSsggzfBfM2WYTekTCdGQkfT/fsUhM U67qmIau5lXFUCuYirE4hNu49oSmAw0InhdcWRwrko8ax9fDXdacxy395vCeZO/X5iyl khjvGR9DPAHs/0WZt0RSjYvHP3OYkLCyOEZme0ZRTDHzMy9mAnWuaCKnY6SvM80Q2JA9 b+vW8LD1OxUkckeK9aqLnnzY2E/7Tj1ggHFt0DuORbC7Y15KNzN+iQYXW7LyhDpKK29u yHCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="Q4/Q46fQ"; 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 l14-20020a170903244e00b001c58401354dsi7676989pls.565.2023.11.14.00.48.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:48:06 -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="Q4/Q46fQ"; 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 BE98E80C3AA0; Tue, 14 Nov 2023 00:47:50 -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 S232681AbjKNIqf (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232520AbjKNIqD (ORCPT ); Tue, 14 Nov 2023 03:46:03 -0500 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5826172A; Tue, 14 Nov 2023 00:45:55 -0800 (PST) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-6c33ab26dddso4647572b3a.0; Tue, 14 Nov 2023 00:45:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951555; x=1700556355; 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=jOfolZFbaeNksDOEbKm+WHbGTOTwNzBMg/acdZEYYm0=; b=Q4/Q46fQKj/iZ+6jlByyi8fVg2sibhtdHaSm03Bmt8R51a/vcqR995EAXBYKk7dB3/ LCg3350aatZC9wTrxN6QUnkQhAS6kjrTDFCXs0UfSMLm9AihNbIieZAFajAPwaVzIfjO 0T3apb2g+IIWCGQ4+GF3uZzfJtWMfvdNAei/keglE1WWMY4ZmRqrMaCfXF3E8jUseOVf VbcHeLY8x5RRBfMdvEXcl022V/e9wkNwGPsQmUIWN+RIiZHAXMe6KwCl+c1pMHEYyBNq cQ3pF220say2e+PB5/HkO8CyE0H2CmULrElKZfKYZt1LDL6kOJBrUGiTwACMIpZ0MXjA qVgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951555; x=1700556355; 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=jOfolZFbaeNksDOEbKm+WHbGTOTwNzBMg/acdZEYYm0=; b=wvE0L2u7/289yHL3o4Db1KUhNz2WFnrKTM+/Zq4VDbAcrZXZ58VNIPfssN6bRC+CsQ 2DLteAfS/waP0VFrHmw4bsCniryjxxRoQ8BgCfXXIA7TYH+SLLL36imdaPN2wdLn27pv 631DUwiE1666E86IVbDeUfzVJCNzyxOTP7ix3KRPIloiyaK5sM+v0SLCIhnrqv0lizov Q7we9TVF6xr+kEHo4cB1jDjs+M4Gfu3uVeJRvbb7mjVTd0ueG82wkg1g1niqV//2GojL qErq9uxwtEv4J57/aC3BbF6/IgN1aHXqx/Y3/wCrzUOV6GVSYxh13c7x497CvSh1H3gl 6llQ== X-Gm-Message-State: AOJu0YxU4rguTBUceJFxP1pwMukAweFu1l2kkg44sFP9215A0yspXeej RydXjVlxvFPr5IbiypByf/0= X-Received: by 2002:a05:6a00:2e1f:b0:6c6:b762:ad8c with SMTP id fc31-20020a056a002e1f00b006c6b762ad8cmr7012892pfb.0.1699951555054; Tue, 14 Nov 2023 00:45:55 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:54 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 12/20] nilfs2: Convert nilfs_mdt_create_block to use a folio Date: Tue, 14 Nov 2023 17:44:28 +0900 Message-Id: <20231114084436.2755-13-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:47:50 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528539957964666 X-GMAIL-MSGID: 1782528539957964666 From: "Matthew Wilcox (Oracle)" Saves two calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/mdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c index 2e7952ac2f67..7e4dcff2c94b 100644 --- a/fs/nilfs2/mdt.c +++ b/fs/nilfs2/mdt.c @@ -97,8 +97,8 @@ static int nilfs_mdt_create_block(struct inode *inode, unsigned long block, } failed_bh: - unlock_page(bh->b_page); - put_page(bh->b_page); + folio_unlock(bh->b_folio); + folio_put(bh->b_folio); brelse(bh); failed_unlock: From patchwork Tue Nov 14 08:44:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164768 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727881vqg; Tue, 14 Nov 2023 00:48:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IHYj6iYfOuXUysDgeabd6Sp5QnE399anvz+p/AB7h70lt2CIM9I+THv3xbZGGX1YhJvl0k4 X-Received: by 2002:a05:6871:709:b0:1e9:bda0:775 with SMTP id f9-20020a056871070900b001e9bda00775mr8699455oap.42.1699951680715; Tue, 14 Nov 2023 00:48:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951680; cv=none; d=google.com; s=arc-20160816; b=A2Nmw5pIOhkE6HQtPP4DY9KErzR1le4qNlYtAotkGPnM+Qjki20IxTXBTGehcxyPNz Ne7psYEHeGwWuI5nhNkMWCKSts4wrPPB7JpYwI3YfbKZuoPyBAx37xwA7a4uE8DldJjD vnqi+mxXf+Y2+BVa++MfECxF58oyoR1ZDjya5cwAnG9XVLHLkrZ84Z+5suqT5AQCxUUt 71YpVmCpB7ufIMYQspdvyRX/QlywxCKC2XxGwniiBdAlJEj4t/UVot2jL6XjUxUrmkyP 5nEbA0aJp6g/YAdPCOTd4v9DIiy0Fp7R7aYBlSgdOojfjK6RwRGdXMUo71jXoNx/l6V9 1IFA== 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=xisVeqpy2L7XrdO22Kj0Z2SYhUle5QFc64kz4XqShlg=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=jL1y1kRJVDPYwlUI4XdbadUOLc7QgUr9SeWOYM8rqjCH2mVb9oKl0zBYYusUFGrIQn d+LWAe38oXlK9F/XVswVPl3KDBUOON+KTZsZzGN32d2OO5YI64GeYP9pTq3tyqJHUZ+c bTXfP9LXav/FTYm6QETOrbtF39DHE8UkrfwWccs0fNOLojGp6hcqQRF/HncpfHrVf2Y1 PVfR9+5lKtWrOwyHSFs9bMHMDOa/Kt7Da6H7ty2omE2MQ/SO4myFhUJBnVRCT7p0NoXd M8RfjC0yVgohlAFTaWMwAEf3fIMggZEGZYh9tP+kr/mbQk0JnfcIw8uzhhu6X0CjCUS+ u8Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=PpXiegtX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id y27-20020a056a00181b00b006be25c80c8fsi7784931pfa.267.2023.11.14.00.48.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:48:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=PpXiegtX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 9D790801CBD0; Tue, 14 Nov 2023 00:47:08 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232696AbjKNIqq (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232447AbjKNIqF (ORCPT ); Tue, 14 Nov 2023 03:46:05 -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 834A6173F; Tue, 14 Nov 2023 00:45:57 -0800 (PST) Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6c4eb5fda3cso3798198b3a.2; Tue, 14 Nov 2023 00:45:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951557; x=1700556357; 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=xisVeqpy2L7XrdO22Kj0Z2SYhUle5QFc64kz4XqShlg=; b=PpXiegtXxKV3CBiT6z6b7ityetE/cQBX81WCX2Pu0zTIrkYLrazHOsyuYxxsbCIcDh Kbg3uDWKK1aQamQa14hz/lSB8eEF90JsjSxwL/VBp6T1LmARfyfKZ2JE4+0WCtTAjUDO ZzMyiRR2us/EdmNfI/Ruve6Den/HZRLYUqxA7XsX9IaiDv1YKGf724+ZCuPcS0ZFyf+v 8TjHmlqsfHT5Wfc1jEqwahS0hwLQHL9S0HOlnwuvCC9yZjSNA2Bn+mc9mv3hvkUA6slr D+GGysVa8TdvUGzNvwtajLAjooAN1Qttdrq/e6EFbAs1eFvL1FEqyIRdJ6SinizHuMqZ jH9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951557; x=1700556357; 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=xisVeqpy2L7XrdO22Kj0Z2SYhUle5QFc64kz4XqShlg=; b=w9+Vk55qCUpTo1CvqW5XYxucKsjujXuOij1UCqcDTFF7TIp+Q9JuNEDh6frw7X9lHS 3QfjD5Bfe7LjXsn+pWI18QeBx02qwPl2OtygGu8uBblTqTNJ4a8mMPTw/pUwWgFwGzv7 nQ1hxbcOL88uqjnw8WlUTH74Ga4ctw1ygUXoVLieL7fOf8ZeBEQM/ZBTGbLz/9JFVIt7 yxHqoJGa8kZ3nRnaqubOfW750zWg1wYfegsAnDil7fqKgQpYXcztmFdU1SlpdL0cvq+m Iq2aZXGNRt8YN2/We74objCwyoD9eR73JJNMBZ5SEqNzxcp7TSEMFBI1wd7zu2jKkQ/+ itRg== X-Gm-Message-State: AOJu0Yw3+7wkXvqLPFJgN52ZY5fw4bA/1HuT69KnoX3WDuO578tJ29Du 0umi43xT0MZ3vcarXUloAYEBkgQrWNY= X-Received: by 2002:a05:6a20:12c3:b0:16b:c20d:f979 with SMTP id v3-20020a056a2012c300b0016bc20df979mr11331159pzg.13.1699951556883; Tue, 14 Nov 2023 00:45:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:56 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 13/20] nilfs2: Convert nilfs_mdt_submit_block to use a folio Date: Tue, 14 Nov 2023 17:44:29 +0900 Message-Id: <20231114084436.2755-14-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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:47:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528533779368361 X-GMAIL-MSGID: 1782528533779368361 From: "Matthew Wilcox (Oracle)" Saves two calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/mdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c index 7e4dcff2c94b..e45c01a559c0 100644 --- a/fs/nilfs2/mdt.c +++ b/fs/nilfs2/mdt.c @@ -158,8 +158,8 @@ nilfs_mdt_submit_block(struct inode *inode, unsigned long blkoff, blk_opf_t opf, *out_bh = bh; failed_bh: - unlock_page(bh->b_page); - put_page(bh->b_page); + folio_unlock(bh->b_folio); + folio_put(bh->b_folio); brelse(bh); failed: return ret; From patchwork Tue Nov 14 08:44:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164769 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727885vqg; Tue, 14 Nov 2023 00:48:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IH73nDH3KIrUq42EenRJYJF3juWgLcDvc9OtvP/x7T0/xkTFWfS4LR+5bEkEeGCRepcLFPs X-Received: by 2002:a05:6870:4206:b0:1e9:ec03:80ba with SMTP id u6-20020a056870420600b001e9ec0380bamr11699155oac.18.1699951681200; Tue, 14 Nov 2023 00:48:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951681; cv=none; d=google.com; s=arc-20160816; b=omudo6ExF2/Nc5UQ3fsOgTKEQ3RG3bDWew7/deFLiq53OvSzDZjSPTUwEuK70UJmgm PQzgc4v0iQZ6t0ErPVripasbiH5sJFN8Ox+8qPQpyYJu++BjppQtaODgzYnr8j8n37kf tBSP1ndnnsLMsRiwvltFbYc6HMXB6VVh65f5nOu2poajHXRldasmyVG/L5yqlptGKCP3 ieGDwZLES7k53hn7I87F5gidSQvJHSuZwgi9P/ZmfVNaCrgr9zftX3Nr18gKaDlYoXAg ThevLpuc5bvT88aqmpUpbo6f4qTUC29kUNcele5GTLGzykAJHgGxfcBCB0H3NEJF54V7 ozfQ== 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=zf/f9iBOx5zFbOHUi2L8dYuwfOZwOV/VjcIWW5aZNCI=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=Ybc6gp6byM8S4C73XWJ6wKK63WMnsxJV9+UIAzgYQLzEu4wNa357qsf4qs2W0vO3xN HzyCJwBrtvCCv2Rd8BnAcOpOaz2aBzHUnTKYtubh58h+JXxdOPTokJ/L9f7nP0dAIdDN tYhRT2gxGmFIECObKbNEAPdcPfgr97XNlF8OiEz2Q4dzKxQnonzemajw9PogxZLTx9lg 3OMiCGhnfHAR+SPqZndapOGpdnYoB5Of9DoMeHMYfNyYIJv2abB6pBgSaUCZmY3P5VWI gb3b1R8OxdPwOaqER91SPynzTMCpmW2zIf1FqZGkbu3NGPMQ1oDihkDN1jTtoS6aWKfC HkQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=B8v0iAi4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id x8-20020a056a00188800b006c0035ff9dasi7846627pfh.198.2023.11.14.00.48.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:48:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=B8v0iAi4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 9EC1E801CBD5; Tue, 14 Nov 2023 00:47:08 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232692AbjKNIql (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232460AbjKNIqF (ORCPT ); Tue, 14 Nov 2023 03:46:05 -0500 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 583DD1A8; Tue, 14 Nov 2023 00:45:59 -0800 (PST) Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-5a9bc2ec556so3223812a12.0; Tue, 14 Nov 2023 00:45:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951559; x=1700556359; 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=zf/f9iBOx5zFbOHUi2L8dYuwfOZwOV/VjcIWW5aZNCI=; b=B8v0iAi4kWFSw4xBDhd+yCGqGjSxUsaQLqxk393Oponv1r4hKDIt0uXMdh4o9tLoZ7 03Dzb6C0Vs3U9OREKrRHXw8faF3ZgeHWxoNsB+8lZm4mDNa806GOblpzPsbLEgjEkNxI r7ps5c/nFm7le8eQrDW/0ccyJ2FskBzkTp9o7b8wm9MoXk1RrMcDBTmEO1Ulqa05EUpS UMclit9dFQ0uUiclwSqPKD6ROK+V8q8vqAYfU7um3Wty0NxNfjn8H33TQosv4J+nyot0 jap1zycVIyH9OP3LJiKcXqygEzR9XPDM2dR5SWQTKqTFsF+DQzKawMolSiaXJJCHAFaF t9Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951559; x=1700556359; 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=zf/f9iBOx5zFbOHUi2L8dYuwfOZwOV/VjcIWW5aZNCI=; b=pxf2WmDPc9i0WCE3+wM9KwcpSwE6xjMivvJ4jj2w61ohiiOiWPHbnCsajhb1Fexvum HOK2xGgkPK7Rl4RECGuwzkdAqIeB+XXXeJ47hwRRVnDf89rXn64mDi7kdGknaDepQcvL 6Hbfcth2266Llw8tNWg6+eo3cc3gALWoN/XeDp8yN8mV2s1Ouv0UW9DczauFeQiT82pC ZL8n/ByPR+4j1ZmbDaRluWOkRJA9iUzS0eONaCrrQp6Ewr5q2JYOs0UrydqMn0VpdsMk knJInRh/Xexxjzv9j40tABQ89hcEY7raO32aAkIYStnBXM6SIwNsgf7N3UpyYUWMPX2D d/Pw== X-Gm-Message-State: AOJu0YwssL7kaqMjLBLRM9oaTsbfHzoQ4wgm6GueOx9NNRBcV+kpDAVj wZINF6vgchUR6+PxCNM2Ch4= X-Received: by 2002:a05:6a20:244a:b0:16b:80f2:f30c with SMTP id t10-20020a056a20244a00b0016b80f2f30cmr7338974pzc.26.1699951558709; Tue, 14 Nov 2023 00:45:58 -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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:58 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 14/20] nilfs2: Convert nilfs_gccache_submit_read_data to use a folio Date: Tue, 14 Nov 2023 17:44:30 +0900 Message-Id: <20231114084436.2755-15-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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:47:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528534145983567 X-GMAIL-MSGID: 1782528534145983567 From: "Matthew Wilcox (Oracle)" Saves two calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/gcinode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nilfs2/gcinode.c b/fs/nilfs2/gcinode.c index 8beb2730929d..bf9a11d58817 100644 --- a/fs/nilfs2/gcinode.c +++ b/fs/nilfs2/gcinode.c @@ -98,8 +98,8 @@ int nilfs_gccache_submit_read_data(struct inode *inode, sector_t blkoff, *out_bh = bh; failed: - unlock_page(bh->b_page); - put_page(bh->b_page); + folio_unlock(bh->b_folio); + folio_put(bh->b_folio); if (unlikely(err)) brelse(bh); return err; From patchwork Tue Nov 14 08:44:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164770 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727913vqg; Tue, 14 Nov 2023 00:48:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IELj2QNwXVX5TFPby3KY0Oxat+LnICXw30n5rW5Wdvhw45/ni159l+jIpnQSl7IQK5YTBTN X-Received: by 2002:a05:6808:a89:b0:3a9:cfb5:4637 with SMTP id q9-20020a0568080a8900b003a9cfb54637mr10603398oij.38.1699951684502; Tue, 14 Nov 2023 00:48:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951684; cv=none; d=google.com; s=arc-20160816; b=P0ZPNJ8Usly02DLptIL4WPdMhYQSd65duABflH0K3xAdQyJKCAYvWDzg83LDfOx5Mf gQxz0T0GWKKKoI6C8/O+y3TV+mv71btYcCabaL98C0FU6jlKvSI7rLGqa62hnnX8grYc v6X7CmqSgFR3w6oW7HZeqdRSnoyCJriK/sknFDGNlKzqblASxrhT4/MUe2szngxkoyUf 5Kz2fJGcz3WBI/+59LZvMMbRsP9OwU1lxuMI1d5RMVmhhuhjF1+u+cZAjS8Mkg4POn29 p7B4Ocx+HM1iZqFIovypp3S2LPiFcDBCoAx6nHMEZPQncXV8lKsjdcSTb73ciWG/A8Pw UHNA== 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=6OonMHeI+fmAL+SrfrNy+FjwHGIExPKOm7s2HbIBrKs=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=LLfAv+qvJF5LmvbzZpAd2vcBwYGS9E2NODUfm6c3Q8EnuW3A2/mBhqo3cJ0+sKyZd4 vnGVoku4ff0xyktGWSSFbp+ZvkfbfMqMsFBNEPfrVvpLOJcEPrRuLUPAyXzm7s74YBGu COCuOj/J47Rq4LxYOAaI8tjH/MaM1aIX06Gfd6AE7TEKPTAvflP7vhpTR4YkcuC+5Hw8 qB/ZFFTcmKVk5COIgYuE4oWD2sRvX3HhLrufzCnfu+kJhKm2BGKBm+uXKpYfNIeBkkKB kstxPLYGPUJsDj5Dae0kg4+A+L4K+aORdcvsir5f9gjIvzY7PGj5Mk/4eCBRkbQd8viU NA7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Vmy3PRzI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id u130-20020a637988000000b0059b79bf220csi6906643pgc.662.2023.11.14.00.48.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:48:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Vmy3PRzI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id E00CC801C7CD; Tue, 14 Nov 2023 00:47:16 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232498AbjKNIqw (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232586AbjKNIq0 (ORCPT ); Tue, 14 Nov 2023 03:46:26 -0500 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 920DCD63; Tue, 14 Nov 2023 00:46:01 -0800 (PST) Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-6c34e87b571so4448722b3a.3; Tue, 14 Nov 2023 00:46:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951560; x=1700556360; 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=6OonMHeI+fmAL+SrfrNy+FjwHGIExPKOm7s2HbIBrKs=; b=Vmy3PRzIwy9D1KpvmXPnqxxPHBP3RQPmqHVwShkW9FxluvJGKlx+M+z09eSBi7nC0G TDx6jR+SkHxjVawrKM+2CdnL3rqKEpaLP0eCOXNMospYt8ifCLAo/OEFI9s1IvXUBYLL WpjFqHzAUAC1xsw96fUUDfD2XEga75Gi4iyKYVXU8moZfgthpcnJzWZhRiPQh6+mOHA6 L+Rm8ET7ARacmTjIXXSB89kAuaEWhWrm27rUdAl0fksjvsiq5Rnq6NmgZ/EurBHlS66X wiQznxEBq1NNZqTZSSqqHC94Umdl7L5Wyxke1r4IofPBz+nouA3oxwhyBO0iT8PxIB6u Xm9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951560; x=1700556360; 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=6OonMHeI+fmAL+SrfrNy+FjwHGIExPKOm7s2HbIBrKs=; b=TBgXMYArTFoaPcxYh3IPLWQfRzyhjgVyZrcUHRrhbJGzF99FB99EdMwCbZ5ILql7W5 TB8Pw+4pphipkHfVKWtUqbFxmbF/BAskQc7x3l7klXlvXEPbws4mDFTj/8x6vAgs5wH2 U9ORJ1aV+hpE88ejXxfk/LJsHzdYDViwiETQdji+BXd65whbR2ANi+E3rm0l+XIN02gC AxWUOoLXswmwXZd+w2qZo3PRUa8Ima7wch0Mv+JHkS19hGyNnJ/rXP2G27ysPLwQ5a8w 7/EKSkgA7Uc5wJ2bzGIOenInwFx2mju5n0bjYSBdR7wpm0An7pliD2NweWzC4T7kCGAT iWAg== X-Gm-Message-State: AOJu0YyhFI0o5WS/TSOYFOQbfzvK8+gL+QNdPedr0zQEWv81t+WwG9st afNc0uax9y0p7FcJboZh+o+WrRbZCBo= X-Received: by 2002:a62:b403:0:b0:6bc:b13c:35d5 with SMTP id h3-20020a62b403000000b006bcb13c35d5mr6461057pfn.13.1699951560636; Tue, 14 Nov 2023 00:46:00 -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.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:46:00 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 15/20] nilfs2: Convert nilfs_btnode_create_block to use a folio Date: Tue, 14 Nov 2023 17:44:31 +0900 Message-Id: <20231114084436.2755-16-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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:47:16 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528537213709566 X-GMAIL-MSGID: 1782528537213709566 From: "Matthew Wilcox (Oracle)" Saves two calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/btnode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c index 5710833ac1cc..691a50410ea9 100644 --- a/fs/nilfs2/btnode.c +++ b/fs/nilfs2/btnode.c @@ -64,8 +64,8 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr) set_buffer_mapped(bh); set_buffer_uptodate(bh); - unlock_page(bh->b_page); - put_page(bh->b_page); + folio_unlock(bh->b_folio); + folio_put(bh->b_folio); return bh; } From patchwork Tue Nov 14 08:44:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164771 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727916vqg; Tue, 14 Nov 2023 00:48:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFN4gHJk4DRt/hiCZi7uLoT4TLGAaDZPk2kX33gJhq61V40Pk3mBwVyTERTuG9ZakGjEDvx X-Received: by 2002:a17:903:32cd:b0:1ce:95a:9210 with SMTP id i13-20020a17090332cd00b001ce095a9210mr1867026plr.63.1699951684686; Tue, 14 Nov 2023 00:48:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951684; cv=none; d=google.com; s=arc-20160816; b=pIbNQvTKhHTAZbkc8lF6hJWiywAEC3gDzc9myM5sU700ZL0Hb1+WmqGVQJgxLtusLu Bm62Eog/0A3gOQ6CIhh+OFARzUtJb9CwFcMqU+hRLiiZQZ14iLkILdJ4q9FGBypeQRS6 4TEChJRvCzfRiOZDLxt7nkbdAIELbLqL2Tl4Rf9WUChrbFa6nBhWKgrvO/iz7Wie7H1O RY3ZXoad836sMV2rO0oW+86NtAG9xM//3goDRY4zbI40CT41geX6NmkiEriGe48atQmP yKGOLTNG/WK2Wg/YVhOWCVT71WXPP1ofxDpkj3Nk1N0Nex0j+wL2/U2Yyu1H6I7b1MpH FjlA== 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=pHyiqrpjh6fekzP9HnVZDAdWYJgQZ8Vlg/OwNXBLqa8=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=YInFVPkz4SrWqdRqaT6XC8kDPwirDtnoTwqpvs+ymOLxBwOH+Kuad9w7BWX0DSBz7l K7EYRxaRAIMUA4djAngJzBxsn+qgJFS24zSr8w2hlcYFAA3/CP/RlILzApbKnR826/0K asGwUBArzaJFTX28Ya6wzp9FOhXxxD7DxSQXOQ6peQLwgXUGCUpyhahrBzYxW9j+cTTd /D8rY2twtHBG+49TxLtj3TFC3mzqSZRYWyKiCTxY2NDBZkDD2uyYuAHdqL0inFAGaLya UU13qtN8wHGCml6w2boohIs5UvX10hZGIESvOeVSG5zbUeWhO3a8wmkhJZbfL0XG5Xkc vovw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fXhUrO2z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id s14-20020a170902ea0e00b001c624237977si8107157plg.252.2023.11.14.00.48.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:48:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fXhUrO2z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 85322801C7C6; Tue, 14 Nov 2023 00:47:17 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232619AbjKNIq6 (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232430AbjKNIq3 (ORCPT ); Tue, 14 Nov 2023 03:46:29 -0500 Received: from mail-oo1-xc2d.google.com (mail-oo1-xc2d.google.com [IPv6:2607:f8b0:4864:20::c2d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7336AD56; Tue, 14 Nov 2023 00:46:03 -0800 (PST) Received: by mail-oo1-xc2d.google.com with SMTP id 006d021491bc7-586ba7cdb6bso3058872eaf.2; Tue, 14 Nov 2023 00:46:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951562; x=1700556362; 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=pHyiqrpjh6fekzP9HnVZDAdWYJgQZ8Vlg/OwNXBLqa8=; b=fXhUrO2zYA4qTOqnQniFqP2O5p9F746F/jGCmtf2IdJYJ5YBQiZTPawyKfCkcGJy86 lSJgppNl5FwfTKVPwLTM1FIdfo0n5vwtSDqp7xEnaEY/+mjmovkw7BAglZyFEKPEUAcW 2E4KhPjPNJskhp8PGZeAcKFrvIcJHyFNQEUpen3SooVpL3kU9J9w+aWU0FvcVKpNj7m9 jfEtKazjGYX49pLbttlVMUbQpQMV54EAfohuX2T46cpkmnJY2W/ayJU+1hnvvyRKgGQO CMtcufbxG34gRY0EXv9Nw8D5tAtOghFGJweWtbWlRmKNbz4eqg3bAtLQoKbLZbqKL16N EXPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951562; x=1700556362; 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=pHyiqrpjh6fekzP9HnVZDAdWYJgQZ8Vlg/OwNXBLqa8=; b=iUVbnsC4M5gj6Of/6oafddbsfMsyuQ2D/mJzeawxpZ/GRNPwly2fgsOGC+c36+KW8u /vnfiBwvcH7T27LgY/2kceqGb652h/8dpAoxdvcYvebq7wpkwYZLdojTNhvv3yQC50b8 En2D2ZjI1MSoQUNTEbhf+oIyT2KgXc9Mq4wQelOk8jJOlIt9KuCHpJK0ka25UW/UMft7 JFYduwEDFZ/HWkJeiW7mwDhApmAr83+pn79GqvyWjPCJEODLTJJkydsXOe+YCuxe8yUA 8npPzCQbLyhgyY6Gt3X9wggztrruqsA1mFbmNJqogBkIYDaPkBGdLRFWTAv9W8H4rwWz 0f2Q== X-Gm-Message-State: AOJu0Yxers+XxcaPA2IeT2GTM+iBskHEt5hQSpKCFIOtxDjekttz7gih AsOO08TZjmZOW3tcT0EmeJXJjvzz+Hg= X-Received: by 2002:a05:6870:bd4c:b0:1ea:8b10:247e with SMTP id og12-20020a056870bd4c00b001ea8b10247emr13073968oab.27.1699951562547; Tue, 14 Nov 2023 00:46:02 -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.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:46:02 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 16/20] nilfs2: Convert nilfs_btnode_submit_block to use a folio Date: Tue, 14 Nov 2023 17:44:32 +0900 Message-Id: <20231114084436.2755-17-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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:47:17 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528537742486484 X-GMAIL-MSGID: 1782528537742486484 From: "Matthew Wilcox (Oracle)" Saves two calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/btnode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c index 691a50410ea9..5ef9eebd8d2e 100644 --- a/fs/nilfs2/btnode.c +++ b/fs/nilfs2/btnode.c @@ -75,7 +75,7 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr, { struct buffer_head *bh; struct inode *inode = btnc->host; - struct page *page; + struct folio *folio; int err; bh = nilfs_grab_buffer(inode, btnc, blocknr, BIT(BH_NILFS_Node)); @@ -83,7 +83,7 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr, return -ENOMEM; err = -EEXIST; /* internal code */ - page = bh->b_page; + folio = bh->b_folio; if (buffer_uptodate(bh) || buffer_dirty(bh)) goto found; @@ -130,8 +130,8 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr, *pbh = bh; out_locked: - unlock_page(page); - put_page(page); + folio_unlock(folio); + folio_put(folio); return err; } From patchwork Tue Nov 14 08:44:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164766 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727828vqg; Tue, 14 Nov 2023 00:47:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IFyBRbyZ4OGly3+C01YH3hTz47spKelEO1/sNfP8F6U1XIzYpA1KIJwYbOY98XLD/YrsTQR X-Received: by 2002:a05:6359:6f0c:b0:16b:f8cf:bca6 with SMTP id tk12-20020a0563596f0c00b0016bf8cfbca6mr801927rwb.14.1699951675196; Tue, 14 Nov 2023 00:47:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951675; cv=none; d=google.com; s=arc-20160816; b=L4oqdwOmlopHn89XnWy1FfgHaJTEaO+UUUIZTmOw6a37t6vR1G3fniJ+z3aNNKVVsM myKOXN9xjU/VzBdjHHdV74RkbzR95zRWF8+lREOypR4pirc44M6tVsJd8ihnUopNo7BX Q+aUy8U97YyYDKXc8yoXYKoAsOjL+9JdBPnQC1rXozV66BWGNbjeroEy9kGMAfL4orgo VzA75C6WXbfW9swPT9KudukV8esmyUrRzBq6SgKD1RDEBjvLRdCyoUhShjxkJo1MPlkh Q8O1bIoRxAkw7KvTKc9wxzXKK+mD3QZSOayl3iEdfozwhTp08M/pjFyDqvNqVTiBklmZ dquw== 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=v358YCD378yAUvjDSYqbMjqywkD/bfhThxAzZwlQTSk=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=J+JSZEZhCoJIMcDWhyqsncsChz+4sQuPtcONxG1PA0QlGlfw/Jk1wle/M6TdxWgFKG wcVZCe+crMtRgVjOb7Vf5gvEfGiKtathoXDTOTEBiv6Xtf2bX7uLKNSIuHjJ4ctQ+CrM ekLbN/60De7BXCI8X4U9m23A2uo9yYIwFcEWoWmUB1ofjHXQahtYwteN3QxC5eh4v0bQ foq/u6XXREpDpZpFfReR/5Fzek+U0sZJ4cLzLiv7AuG9L4fogONDsXFFPXLWxOMjfPsO lUSqE3X7EUHmnuJWS9tyRz7WiIuB5Ps9ELKkoT3Gq2F5xs32lLoVXw9WJepJcJC/QGM3 bBog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mHOGuFVK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id d16-20020a63ed10000000b005c179c0075dsi5761137pgi.883.2023.11.14.00.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:47:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mHOGuFVK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id F0D228041952; Tue, 14 Nov 2023 00:47:50 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232633AbjKNIrD (ORCPT + 30 others); Tue, 14 Nov 2023 03:47:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232629AbjKNIqa (ORCPT ); Tue, 14 Nov 2023 03:46:30 -0500 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AE921998; Tue, 14 Nov 2023 00:46:05 -0800 (PST) Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-6b1d1099a84so5371894b3a.1; Tue, 14 Nov 2023 00:46:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951564; x=1700556364; 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=v358YCD378yAUvjDSYqbMjqywkD/bfhThxAzZwlQTSk=; b=mHOGuFVK4jFaLGYVqhWbAgtTr37E66fbEpUFyra2s7OyZHcEoJf4DB6vTfujlQxHT6 nJ1TEcgQ3kNTV4OkPsw+m/CmcnNDLMFGa7VG2jPCvEwoTGmIipzixdtMunc50sNPwRLn DSZodufzhCsqS3Sn5JBsAnyJJ0i1vkLRdXxmfGpqsKxwwZBoeLIo1/Zbz6rOqCXMR/13 Xib4P6ZLl0FbKUTSSXMzLMpbk0WwPTo+h40DQoyaKejKSaBXrYDdorgCDZikp8MjUGM9 QbO5UdeZw3vJXAg86nlxgnhpXdEuRxX5q3JGY1HyjP7/ilAP9b9O98/2xLXvpUge5mRm 2Haw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951564; x=1700556364; 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=v358YCD378yAUvjDSYqbMjqywkD/bfhThxAzZwlQTSk=; b=MLZ4CPWCMs7lYcSX/gZW7hq+M2zvpAqbPXIkhBJZfXVYnGGctm2mEUsckFynCRFDU9 k8PvAtBZ/ImHpjzPlQ1SZFiwMS6I8Kw5CAO+muBOynXBXHTLAPkelAy65eDg1h9TlOIn EHaINJbKI13ySVt1fDskVbylxPdOnH6Z/CCzSz8RtV9n7thWhBb65BZJpJ3b+KueYzHa LuxQ91vh9dbTcx7GmidxVz5HAcZEn4M8EB3KgPmx0mPlJrDGUCpzvhYWI5SRSHJC2PnI opBiSV6VcXMcMXyaGOV++QHOmzqDgi9pImO51X/GZ9m9L3NzQt/W1jwM9cO4l7vfmOV/ ttjA== X-Gm-Message-State: AOJu0YzL3bcyS7s/vw65cSrQZrehdnZGfphnldqxXQaZQpl2SyrllXce 8rgr4rf5uoXarOO1KXlZseI= X-Received: by 2002:a05:6a21:788b:b0:180:daeb:ac5e with SMTP id bf11-20020a056a21788b00b00180daebac5emr12442402pzc.10.1699951564355; Tue, 14 Nov 2023 00:46:04 -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.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:46:03 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 17/20] nilfs2: Convert nilfs_btnode_delete to use a folio Date: Tue, 14 Nov 2023 17:44:33 +0900 Message-Id: <20231114084436.2755-18-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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:47:51 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528527712824125 X-GMAIL-MSGID: 1782528527712824125 From: "Matthew Wilcox (Oracle)" Saves six calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/btnode.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c index 5ef9eebd8d2e..e077d4a7a11c 100644 --- a/fs/nilfs2/btnode.c +++ b/fs/nilfs2/btnode.c @@ -145,19 +145,19 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr, void nilfs_btnode_delete(struct buffer_head *bh) { struct address_space *mapping; - struct page *page = bh->b_page; - pgoff_t index = page_index(page); + struct folio *folio = bh->b_folio; + pgoff_t index = folio->index; int still_dirty; - get_page(page); - lock_page(page); - wait_on_page_writeback(page); + folio_get(folio); + folio_lock(folio); + folio_wait_writeback(folio); nilfs_forget_buffer(bh); - still_dirty = PageDirty(page); - mapping = page->mapping; - unlock_page(page); - put_page(page); + still_dirty = folio_test_dirty(folio); + mapping = folio->mapping; + folio_unlock(folio); + folio_put(folio); if (!still_dirty && mapping) invalidate_inode_pages2_range(mapping, index, index); From patchwork Tue Nov 14 08:44:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164773 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727933vqg; Tue, 14 Nov 2023 00:48:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IF/V9Ib2QIvSQROo2FSQHPjXq4qxJ6phd3Fx2baOTaenYGB3+ElNjSYyBMOvTGvfkjn9RqD X-Received: by 2002:a05:6808:19a:b0:3a6:fbe3:45cf with SMTP id w26-20020a056808019a00b003a6fbe345cfmr9755754oic.35.1699951687515; Tue, 14 Nov 2023 00:48:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951687; cv=none; d=google.com; s=arc-20160816; b=BRzNEYzg3n5wZL9tssOkvnTnBalyGkWVTPTn6trILXby67NjcrPMJnbfQ8hzwtEVDs vnM4cVLj5fb0LZx29lFm3KeTEVhQheYOEUXhABD6EqbVBdkZMmNFfy43iqVYvrvKBhKz r96YI/9MkUK4P0mfisWh820LPCQ7yLENMEWQW/GeDN9J4w6ZsmkSDlpycNz5+92Dx3mC +6vC9QR0YrYU/TYySFEKj+qqEmgls64bXvLavU4WocHPWW4g+KVOtftiL3HPDWFS6ZpQ iQpQwaFtrKO1lQJuNHLDE15pz27a9xu5O8/Deyk9VYlCqHHP+L5d4BVV3NkG969cO16Z sQBw== 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=0u3It2drrXQuzpGZGjojr+w5m1YXAaW5alfZVPVoURE=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=mmnhqg7N0jokNA+Hl4bOsEUtOfq7cEi7ssHuP/mLUcGxEc/6hET2OAB1bw23th98b3 grdR/ZinbMnNKouJ+4Q9WKEXc9nzsyK5vhuYPOGmdGK74d2N0y28Doc/BuWt5e+5emFd R80Zkh/bo3BsGDXYTNLMdUU+xbhszDAyxJHpFX3zd6Rmpc6dn3fuToNjwjORBdM4mRGX tqsV25daJRWpHktaHeBR/ahdvJDWaHkG7eVFY8dhUerDm2WsZGCmaQcK0JDhfzLmKbn1 EzZ4sZGOVhb5iRp1N90sVR1dZV0p1dUaMekOAI8mRLCzSg1w/eatrX0O5ru2jDLRaILO ob4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="i/4913lM"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id a1-20020a656041000000b0055b640a6b3csi7953736pgp.884.2023.11.14.00.48.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:48:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="i/4913lM"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id C3351801C7CC; Tue, 14 Nov 2023 00:47:24 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232495AbjKNIrG (ORCPT + 30 others); Tue, 14 Nov 2023 03:47:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232641AbjKNIqb (ORCPT ); Tue, 14 Nov 2023 03:46:31 -0500 Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1C5D19A6; Tue, 14 Nov 2023 00:46:07 -0800 (PST) Received: by mail-oi1-x22a.google.com with SMTP id 5614622812f47-3b2e4107f47so3625430b6e.2; Tue, 14 Nov 2023 00:46:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951566; x=1700556366; 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=0u3It2drrXQuzpGZGjojr+w5m1YXAaW5alfZVPVoURE=; b=i/4913lMnZTbNYYbBZxoONrvQd3ILz3Gk1WhsiUXlZ1IK2BRpcSrN/A6OvM8Q8yWMW JeGAdcKOWdcl/M5YsFBxHi7tlv2tI5qOcAC6xl9loODcv6dpKPNcgApv0WF7CAKoYVKb VE4sQk+3BnMFAqfZbnXYRguV6wPuJcLsljkL0L8ccJKh/0RbLUqVdf4aIUiBRiuWlgr/ fZbVBf+lOfe/qAarBh6BHTB2yJYjGPni/RuQ77idmjUD3YeP++5MDcDzY+L5ugjmMEEn xTJ6v23CQMUt287u6JtXJ6uvxUkvpFURDbjt8Ef5I/dbSIyVuY9b0GNBm7SVszmW5Ri4 +PFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951566; x=1700556366; 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=0u3It2drrXQuzpGZGjojr+w5m1YXAaW5alfZVPVoURE=; b=jMCGvASOmSOrzXnpFhCVK8gYXTGQgpSD5kWDX6bhBmRS7TsmJ4Cet6+WJXd8zc3A+m 04tpefaWsGzbDWLABRqB/ea39OiXVA2tRDcDH9GW8dFIafu3SEhGW/eFdnm8o8qN7/1t cK0wQ0xTPAe7IizAzRFjxx4v5Rl3L2ZhlOpdKFIO2+gqfhEgp5+hLerZDZAKBZNNAgWc o7yAORnkrLvCPAYyELBp8153vhnc3bHbzseIln6d4g3wmgamqJlH3CFBnZYbHLzDQjR5 CGwhN6xaTV/mO5WH27V84WxzU5gxLwR2Tgz7R8cp7H/Dtm7bhz1dtF8FoJeboS8cBWvy 5XnQ== X-Gm-Message-State: AOJu0YyvDSURW4++8jOnlvtwlz0ujfrQz9PddNJj/EopNE59u9pydM0l 6gAU2y9g7p3L2IfzXHLRwO8= X-Received: by 2002:a05:6871:6203:b0:1f0:820a:e4b1 with SMTP id rd3-20020a056871620300b001f0820ae4b1mr11524624oab.34.1699951566366; Tue, 14 Nov 2023 00:46:06 -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.46.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:46:05 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 18/20] nilfs2: Convert nilfs_btnode_prepare_change_key to use a folio Date: Tue, 14 Nov 2023 17:44:34 +0900 Message-Id: <20231114084436.2755-19-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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:47:24 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528540437249347 X-GMAIL-MSGID: 1782528540437249347 From: "Matthew Wilcox (Oracle)" Saves three calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/btnode.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c index e077d4a7a11c..da3e4366625f 100644 --- a/fs/nilfs2/btnode.c +++ b/fs/nilfs2/btnode.c @@ -185,23 +185,23 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc, ctxt->newbh = NULL; if (inode->i_blkbits == PAGE_SHIFT) { - struct page *opage = obh->b_page; - lock_page(opage); + struct folio *ofolio = obh->b_folio; + folio_lock(ofolio); retry: /* BUG_ON(oldkey != obh->b_folio->index); */ - if (unlikely(oldkey != opage->index)) - NILFS_PAGE_BUG(opage, + if (unlikely(oldkey != ofolio->index)) + NILFS_PAGE_BUG(&ofolio->page, "invalid oldkey %lld (newkey=%lld)", (unsigned long long)oldkey, (unsigned long long)newkey); xa_lock_irq(&btnc->i_pages); - err = __xa_insert(&btnc->i_pages, newkey, opage, GFP_NOFS); + err = __xa_insert(&btnc->i_pages, newkey, ofolio, GFP_NOFS); xa_unlock_irq(&btnc->i_pages); /* - * Note: page->index will not change to newkey until + * Note: folio->index will not change to newkey until * nilfs_btnode_commit_change_key() will be called. - * To protect the page in intermediate state, the page lock + * To protect the folio in intermediate state, the folio lock * is held. */ if (!err) @@ -213,7 +213,7 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc, if (!err) goto retry; /* fallback to copy mode */ - unlock_page(opage); + folio_unlock(ofolio); } nbh = nilfs_btnode_create_block(btnc, newkey); @@ -225,7 +225,7 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc, return 0; failed_unlock: - unlock_page(obh->b_page); + folio_unlock(obh->b_folio); return err; } From patchwork Tue Nov 14 08:44:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164774 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727938vqg; Tue, 14 Nov 2023 00:48:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IFV+5qUgHYJSYjFqUT2FZdIBqLd8AjAePjbIiRiOnx19fn81JitviT3TnVZl+wxqyWCDLP8 X-Received: by 2002:a05:6358:90c:b0:16b:c810:b98d with SMTP id r12-20020a056358090c00b0016bc810b98dmr2133400rwi.21.1699951688295; Tue, 14 Nov 2023 00:48:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951688; cv=none; d=google.com; s=arc-20160816; b=x0lqPGD5O6r57+fJQ6u1nMSogkCPpuSM3NiU92smO0+uyRD17nIuoSlj0mlgZ/Mpqv pfWE6tYiiLYSbHsFb9s6ra1qdbUxNE3EqyTJ1o+vHXdgY6fcrmTC2C6QLtuZVxjyOBiX 9ScwlGJ9Rf3ThkAbWk+iW1haJJj7nuCqYP/2LYRWMrD1oBLbw6KhFHg0/AEEMWbaY7eb h5ts1KVucuQSMz9NJdKcN452aAX0+f+TRCebH9ryHjoFX2Qv0ypyUMPwhHcH1vg2lF9v DsRqeHDXjRaJ1daQPM9zokoiuESPsiJAqbl4qKt9DHHjNUMRwjQCPUBSOzh4YzNKSUPX i/oA== 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=rHhSpVpoa8KYOjWaZwduZV1w+B3zSOWFnG1dbpteVKA=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=EW7G2yZR849McmrqE4ovDuNVWihqdyr1KQhPPQ94OuBzuaDDG2tuS8vWtXnTWn5bz0 TOLZkxa3SAh2VPvyS8m5k+Cq1/oTOC0Qw9z2wYU38rPHADsbbTcr3IHJ1aLeke8nNKOR K4y6gGdh7WjGBSczrWvM5p817OBHkfqrD+55/MVySQ77cpaOFf1OEpdxuotOCH0OXO/g NgP9QhrelXoHd+6Un06Jnu0O3jKeT8uSWftFjIYM+5UqlK/MrP1+lx5KQ+IUhL986TGf 7Klwi/Z5fTsK7QWpk2h+CLUekiKOyg1k91cmrXeED6rQMPhU8ahaiTnBRLeq0onlrj1j 9mBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=gxEpY1lJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id k26-20020a63561a000000b0057821ea0674si7815497pgb.812.2023.11.14.00.48.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:48:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=gxEpY1lJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id CEB95801C1A7; Tue, 14 Nov 2023 00:47:27 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232656AbjKNIrP (ORCPT + 30 others); Tue, 14 Nov 2023 03:47:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232529AbjKNIqb (ORCPT ); Tue, 14 Nov 2023 03:46:31 -0500 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2402819B5; Tue, 14 Nov 2023 00:46:09 -0800 (PST) Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-6b5cac99cfdso4619454b3a.2; Tue, 14 Nov 2023 00:46:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951568; x=1700556368; 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=rHhSpVpoa8KYOjWaZwduZV1w+B3zSOWFnG1dbpteVKA=; b=gxEpY1lJatMoM4W/ncumjdVT3M/5Wl0N37iAzYmFzgshyc7AVQn5h1OnhNq1Htl/U+ 1NTbDy1pu8gRVLELDHkXeXix80sZ3Zhil3Gyf2kO5/K9PG+HnF/4490bsHhrazvq3Q7T LKYBwRlHYWoWVdiVGGR4bk4xAyfls+MfZE3dLB7nuVvk6FedxeXMC/wyTtZ6YHKKujwu 8a59DczDj+RPJcfJzf6q0oZLPH6T7h8RsGTXHOlqQrpmWEpmhXMkMufjg1NkmsGwGiyR U9KhkOs3utxfheBSw9zppKwHWcjTuyRiH/3Y2Ue/RRZ3CvL7zsiX3qv8drA4LUIZ5SE3 J4aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951568; x=1700556368; 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=rHhSpVpoa8KYOjWaZwduZV1w+B3zSOWFnG1dbpteVKA=; b=Y2f5rPux75pDM4gjGiZnfuN6OCJ9NXvhy6DulgQ4bJdt+SEJ5SP9jic5RI+NOcvfkv /CoOjmnSOyFCqSSqvJQQCYA5LfCdAtObTvYluINZ6EJ4wse6kQShRX3qq41tqiMvr5hB 83E8Xdz9oDEHlOqYqgRTzCy2bCMo721z7Ya0I/6eyO+ysI6X2b6I8oiwhimPwKrYOXCZ UHjDeHyvRsRo2hskvrhEgAP+XR93uIMeF3Cpg6I+vDKs/2gRsmN2ewBbNTUW7mZJdaAH gHNoo9NkhWaKM4yvveI+6eSYpjVuHxoBzReacUbKVXjsNoSXh0gcvhcSpwzpErCHKKKK 1/KQ== X-Gm-Message-State: AOJu0Ywy4ATsEbhEh3LTfiD0LFRFf1JaeUYZdsrXcMt+cUyWznf2EB1D i63keg/mHla6OwsDJePClYQeadPiV/o= X-Received: by 2002:a05:6a00:4e51:b0:6b8:69fa:8ff with SMTP id gu17-20020a056a004e5100b006b869fa08ffmr6053039pfb.17.1699951568593; Tue, 14 Nov 2023 00:46:08 -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.46.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:46:07 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 19/20] nilfs2: Convert nilfs_btnode_commit_change_key to use a folio Date: Tue, 14 Nov 2023 17:44:35 +0900 Message-Id: <20231114084436.2755-20-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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:47:28 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528541438655883 X-GMAIL-MSGID: 1782528541438655883 From: "Matthew Wilcox (Oracle)" Saves one call to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/btnode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c index da3e4366625f..fb1638765d54 100644 --- a/fs/nilfs2/btnode.c +++ b/fs/nilfs2/btnode.c @@ -238,15 +238,15 @@ void nilfs_btnode_commit_change_key(struct address_space *btnc, { struct buffer_head *obh = ctxt->bh, *nbh = ctxt->newbh; __u64 oldkey = ctxt->oldkey, newkey = ctxt->newkey; - struct page *opage; + struct folio *ofolio; if (oldkey == newkey) return; if (nbh == NULL) { /* blocksize == pagesize */ - opage = obh->b_page; - if (unlikely(oldkey != opage->index)) - NILFS_PAGE_BUG(opage, + ofolio = obh->b_folio; + if (unlikely(oldkey != ofolio->index)) + NILFS_PAGE_BUG(&ofolio->page, "invalid oldkey %lld (newkey=%lld)", (unsigned long long)oldkey, (unsigned long long)newkey); @@ -257,8 +257,8 @@ void nilfs_btnode_commit_change_key(struct address_space *btnc, __xa_set_mark(&btnc->i_pages, newkey, PAGECACHE_TAG_DIRTY); xa_unlock_irq(&btnc->i_pages); - opage->index = obh->b_blocknr = newkey; - unlock_page(opage); + ofolio->index = obh->b_blocknr = newkey; + folio_unlock(ofolio); } else { nilfs_copy_buffer(nbh, obh); mark_buffer_dirty(nbh); From patchwork Tue Nov 14 08:44:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164775 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727955vqg; Tue, 14 Nov 2023 00:48:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IE3cJx5HKrgDhDYrU260C9fKZFENpzMagSdGVszN7eafigMGndFYC8PckpUNs2lgY1RUCUv X-Received: by 2002:a05:6a00:8c02:b0:6be:5a1a:3b93 with SMTP id ih2-20020a056a008c0200b006be5a1a3b93mr7977739pfb.4.1699951689868; Tue, 14 Nov 2023 00:48:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951689; cv=none; d=google.com; s=arc-20160816; b=PeFuMt/f74LHWb855G8eRlyFAoe38oTCYZgCQjsyY+f4wvRmCPMLlJ0bpRQITOMF4k kf1avHGoKXJ9NbtWmtNONhkAuyKNvxDqAtvXYszX9eYP+D+2H67hql4xKtATkRcc4G85 4kyp54yK0lcZeC2jC8vvW8MF8QHbiYUWrUTJy2X8uZA6RzLEsxpMu4Y9i039XxvkehKH rynSYZVI/V0WIX0mD+0szBQ3sGGoimh4ejoZjNrYP5VIQ44umsEe2vA2mjfzHTc3aPkC kk+gbBlMTxWZGIZ0cYuvMgigxoLjdwA/mh168aUMM5dReQaEyfHKCJvNcvbS1wKkGU+y Xacg== 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=cYy3qj/vutDt+D3+abE3OR1PaLNKfT9k3Yx/seQi4CM=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=U0T0uUdtLypSsasKh0A8UTI5S/522d4LKmkBMzbPk1qWBa/k4kDX5CJEJYCY+tUKr7 NXE8NWZAMrGAB1ojndyVlyrhrMWRNXQZM6oty8tZ4XyP3jlo/5LFKXeAn4s+7wye2Vw8 VDi8GRkRefeD7Du1g+rtT8Ki194GhYDW60u0Sg/Z8x/wPUIf+iLIM0dt/HTutIlhK8BT Y8CKLyUWQrqsz3yIBbXLKtSA/Fiqxk3hat+lkYNicvLWJxcW8NB2lJuJ3zobYDP19Iww iERME5ZQPynjbY8szR+D6ixJF59eMLti0wOhJDvCVjyvnif05315Sx0KV4J2oPzy7hSr eAvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eseC46oW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id bd33-20020a056a0027a100b006be0f4747e3si7710466pfb.123.2023.11.14.00.48.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:48:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eseC46oW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 59DC3801C1A9; Tue, 14 Nov 2023 00:47:33 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232671AbjKNIrT (ORCPT + 30 others); Tue, 14 Nov 2023 03:47:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232672AbjKNIqd (ORCPT ); Tue, 14 Nov 2023 03:46:33 -0500 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D10E1BC6; Tue, 14 Nov 2023 00:46:11 -0800 (PST) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6c320a821c4so4572396b3a.2; Tue, 14 Nov 2023 00:46:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951570; x=1700556370; 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=cYy3qj/vutDt+D3+abE3OR1PaLNKfT9k3Yx/seQi4CM=; b=eseC46oWq92951qfMVbWpumE3BsQ7VPqmRlMHOIssSdgBVMOK12OFTH9omCxYSNh2G NSzd7b1MNxLC4f2a6A7p3cb/S/oQB+c7R6bOTtGSfGRP+35Zqj8VSExp5oYCZau/WdtO 1tKlscof0R9uHb3SuJg2yFkZdYK09l6nUwyUBhdt1o4W0644W3VQeaLiUhcwtYihcQOu yusFsXn723WdqzBlixD8bNWkT4v8xs+cw1bLawUYRJZ/388OW/wNgLfg3/nDqbS35fGG Vc8ODGIauiXWctNi5+Vg5v7y+L3R9DpLIZy2AgEUV+EZerwHVrcKAFhbHxXwpTOZL1zu 6MZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951570; x=1700556370; 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=cYy3qj/vutDt+D3+abE3OR1PaLNKfT9k3Yx/seQi4CM=; b=jZ8qKtEZWBqdiSJEy42nvLR8ylNxygO0h9ezbvkmRC5BLnl2IJAQL/5cuXAun6cYi8 0DxK6KOvZZJjz1/EysiRVlT5Hl0cjH+IA417y8C4Lop2NnaEXcGOvVwS22h8uvV7YZ36 tcL7X4xfamBiVh3q38E1L3ccxdCAdYz1rBJ6osy5j5m+04ebDW/EZfMndfZJsKm/QCus Przq9DCQIDebXEli0itm7IYa4kCQCUFB3iOPG2dsrBVSBfwJFe9QwAOGhd2jmCe3TWPl luNx4ozqjnwdXPZrW1mlI63GdpMVnNJfgIXLUCAzjOzAlaep1+LAucJfokynyDyKsrlE vT8g== X-Gm-Message-State: AOJu0YwEiwkPxWvf5slyITGl7UBUQsfvjKEFdDdmPNFraRgV8Odqk4oi kj1BDiA2axh8ViI+BBPY2TFYCEbkg50= X-Received: by 2002:a05:6a00:4388:b0:6c0:642c:274b with SMTP id bt8-20020a056a00438800b006c0642c274bmr7557613pfb.9.1699951570453; Tue, 14 Nov 2023 00:46:10 -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.46.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:46:09 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 20/20] nilfs2: Convert nilfs_btnode_abort_change_key to use a folio Date: Tue, 14 Nov 2023 17:44:36 +0900 Message-Id: <20231114084436.2755-21-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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:47:33 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528543199763254 X-GMAIL-MSGID: 1782528543199763254 From: "Matthew Wilcox (Oracle)" Saves one call to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/btnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c index fb1638765d54..1204dd06ead8 100644 --- a/fs/nilfs2/btnode.c +++ b/fs/nilfs2/btnode.c @@ -284,7 +284,7 @@ void nilfs_btnode_abort_change_key(struct address_space *btnc, if (nbh == NULL) { /* blocksize == pagesize */ xa_erase_irq(&btnc->i_pages, newkey); - unlock_page(ctxt->bh->b_page); + folio_unlock(ctxt->bh->b_folio); } else { /* * When canceling a buffer that a prepare operation has