From patchwork Mon Mar 31 20:10:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 14033936 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 CB1E2C3601E for ; Mon, 31 Mar 2025 20:13:20 +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 1tzLVY-0003lF-CN; Mon, 31 Mar 2025 20:13:20 +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 1tzLVP-0003kN-VX for linux-f2fs-devel@lists.sourceforge.net; Mon, 31 Mar 2025 20:13:11 +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=eewOO5MdDaINIG870LNZy7ghhnwCLEVQalhgq5caK8Q=; b=NFEI1nEFmWW1i15HVE1TfDK/Zs n23RgPSYCSI9Tez5ynZNT2WavJh0lv+Yec18bMfKIoQSD57mvXoeeXDuqTRuxyMMu1/T1BWdFc73D IaD5cjlfpT3euizL4FZs8OvV0EGSFJWbX7dwDjWpQ3+FPzDjr24mWHysBxtZVXj9ahKM=; 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=eewOO5MdDaINIG870LNZy7ghhnwCLEVQalhgq5caK8Q=; b=D9zY+HR3QLYpUkMlSzJImmmvWt Q79u9HCtpkip3ZL/2EVDUP9F+6j/X/67NSV0XH9xxrknuGB5ZGyOGEAUfzO9vfqLolmKGKs2qq4yj vGCVF68hxfoZL1HXniHGElocwJERraLyY26O0iLb+tIZuWGyaRdosbaaUYILsjmpJPfc=; 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 1tzLVP-0003Ya-Ba for linux-f2fs-devel@lists.sourceforge.net; Mon, 31 Mar 2025 20:13:11 +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=eewOO5MdDaINIG870LNZy7ghhnwCLEVQalhgq5caK8Q=; b=FumxA9hb+hHhdfG9P7gq5ERwCX QAfV+gzRM50pPvQdtx0vB3juYW4mfrqJh5ESgx8TW9Uvc9l7NvX5Ihtj1IIoi6aOpQeHlPM1drMXD uc3RKrh6uR2dpsti0W2UDEPlNTTOxO46eirw9TuRQFQstYGiAXiZforNMK/2PjE/7fotgFwZnTk3X sLUoyuWovGDsDka5k32pQare0P4Gsr0/vw+HSKiEhu5ftR7T9OHgoCTRJY0NzWUFbNaUdy2M//UFY yP7yTYy2OEuA+oULwQQGsuNiogCVKkrCBk6ymVa3z8AYMs+2Tu9wT5WKEDVXsmB+XPjC90jt0Va1o Xf286nqg==; Received: from willy by casper.infradead.org with local (Exim 4.98.1 #2 (Red Hat Linux)) id 1tzLVJ-00000004Rb3-008i; Mon, 31 Mar 2025 20:13:05 +0000 From: "Matthew Wilcox (Oracle)" To: Jaegeuk Kim , Chao Yu Date: Mon, 31 Mar 2025 21:10:48 +0100 Message-ID: <20250331201256.1057782-29-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: 1tzLVP-0003Ya-Ba Subject: [f2fs-dev] [PATCH 028/153] f2fs: Use a folio in build_sit_entries() 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 Convert get_current_sit_page() to get_current_sit_folio() and then use the folio in build_sit_entries(). Saves a hidden call to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- fs/f2fs/segment.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index baf24d29ed44..aa0f2f243dba 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -4491,10 +4491,10 @@ int f2fs_lookup_journal_in_cursum(struct f2fs_journal *journal, int type, return -1; } -static struct page *get_current_sit_page(struct f2fs_sb_info *sbi, +static struct folio *get_current_sit_folio(struct f2fs_sb_info *sbi, unsigned int segno) { - return f2fs_get_meta_page(sbi, current_sit_addr(sbi, segno)); + return f2fs_get_meta_folio(sbi, current_sit_addr(sbi, segno)); } static struct folio *get_next_sit_folio(struct f2fs_sb_info *sbi, @@ -4916,15 +4916,15 @@ static int build_sit_entries(struct f2fs_sb_info *sbi) for (; start < end && start < MAIN_SEGS(sbi); start++) { struct f2fs_sit_block *sit_blk; - struct page *page; + struct folio *folio; se = &sit_i->sentries[start]; - page = get_current_sit_page(sbi, start); - if (IS_ERR(page)) - return PTR_ERR(page); - sit_blk = (struct f2fs_sit_block *)page_address(page); + folio = get_current_sit_folio(sbi, start); + if (IS_ERR(folio)) + return PTR_ERR(folio); + sit_blk = folio_address(folio); sit = sit_blk->entries[SIT_ENTRY_OFFSET(sit_i, start)]; - f2fs_put_page(page, 1); + f2fs_folio_put(folio, true); err = check_block_count(sbi, start, &sit); if (err)