From patchwork Mon Mar 31 20:12:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 14034030 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5FD7EC369AA for ; Mon, 31 Mar 2025 20:13:56 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1tzLW7-0004IE-Uu; Mon, 31 Mar 2025 20:13:55 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1tzLVw-00041k-3I for linux-f2fs-devel@lists.sourceforge.net; Mon, 31 Mar 2025 20:13:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=3tnbPlSrEIPTDpUIdfP0RUA/zrE/Atj3MxHYqa75ynw=; b=UAspyd10OB5Ig/2DXCKGld/Ir4 NmTDmCcXT6+LoI5Fn3ExHU4RKfuNDsdffQfcSq34bMsecARwoVG7jfJnV7EZ4mNR0L8qbkXJW5B3k 8r/NUpDeoAwpOKcc/zIz53PcMxXc9wns9EbWt8JE/WlC0gSJGxhqjHLMYjLddcCc4lHo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=3tnbPlSrEIPTDpUIdfP0RUA/zrE/Atj3MxHYqa75ynw=; b=Om3uFXjXXUsuVEioRuM7TNitkX SZvxqzF1QTTvv4B9iXo2q7RoZt870giGdVnxEPEN5JQdurSmMV1843reiMjSNFnSf0BJ1DvQ5lKSO VN5yjp+1XEPrRaMhqKAWpOGZCTfqxbtlqwUly/3tIErUuSpLW49snmCRIzuUnZ3RI/uo=; Received: from casper.infradead.org ([90.155.50.34]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1tzLVq-0003iY-GM for linux-f2fs-devel@lists.sourceforge.net; Mon, 31 Mar 2025 20:13:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=3tnbPlSrEIPTDpUIdfP0RUA/zrE/Atj3MxHYqa75ynw=; b=N0N48k0V+ZXt4pACs3eoxx6JmQ jrURja7SbtZuxbHUD+NdBA0OoGsyaxcOpbObwzMzy4ppvsVsMwdPxgY7BGxUoY4sEUuZ8rUpxau1r 7UEBoUF2bIiboL8FtAaA2mST4+aHBohDi6cm8Buzw755QtaeERL6Ft7L5GyjFj1LslLhWWbVFUqrf TbiH/x88kEs885nLuksstEyQSIBiQBBgsPgRz8ZuMBCq/DYidlNByc6di5dsLiRv55iZ6UmrXUiNB XfGcGsbDo1Q+b1ysHk0jB3friv+Fz65+HEHVr7k/aevAyYf0T94UnOxr+Z4wVMgVrZP/i1cDbItre Jsx853Vw==; Received: from willy by casper.infradead.org with local (Exim 4.98.1 #2 (Red Hat Linux)) id 1tzLVf-00000004Sf0-0DLZ; Mon, 31 Mar 2025 20:13:27 +0000 From: "Matthew Wilcox (Oracle)" To: Jaegeuk Kim , Chao Yu Date: Mon, 31 Mar 2025 21:12:53 +0100 Message-ID: <20250331201256.1057782-154-willy@infradead.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250331201256.1057782-1-willy@infradead.org> References: <20250331201256.1057782-1-willy@infradead.org> MIME-Version: 1.0 X-Headers-End: 1tzLVq-0003iY-GM Subject: [f2fs-dev] [PATCH 153/153] f2fs: Convert clear_node_page_dirty() to clear_node_folio_dirty() X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Matthew Wilcox \(Oracle\)" , linux-f2fs-devel@lists.sourceforge.net Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net Both callers have a folio so pass it in, removing five calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- fs/f2fs/node.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 753ecca6d511..5232e43db779 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -120,14 +120,14 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type) return res; } -static void clear_node_page_dirty(struct page *page) +static void clear_node_folio_dirty(struct folio *folio) { - if (PageDirty(page)) { - f2fs_clear_page_cache_dirty_tag(page_folio(page)); - clear_page_dirty_for_io(page); - dec_page_count(F2FS_P_SB(page), F2FS_DIRTY_NODES); + if (folio_test_dirty(folio)) { + f2fs_clear_page_cache_dirty_tag(folio); + folio_clear_dirty_for_io(folio); + dec_page_count(F2FS_F_SB(folio), F2FS_DIRTY_NODES); } - ClearPageUptodate(page); + folio_clear_uptodate(folio); } static struct folio *get_current_nat_folio(struct f2fs_sb_info *sbi, nid_t nid) @@ -930,7 +930,7 @@ static int truncate_node(struct dnode_of_data *dn) f2fs_inode_synced(dn->inode); } - clear_node_page_dirty(&dn->node_folio->page); + clear_node_folio_dirty(dn->node_folio); set_sbi_flag(sbi, SBI_IS_DIRTY); index = dn->node_folio->index; @@ -1381,7 +1381,7 @@ struct folio *f2fs_new_node_folio(struct dnode_of_data *dn, unsigned int ofs) inc_valid_inode_count(sbi); return folio; fail: - clear_node_page_dirty(&folio->page); + clear_node_folio_dirty(folio); f2fs_folio_put(folio, true); return ERR_PTR(err); }