[26/31] ext4: Convert ext4_writepage() to take a folio

Message ID	20230126202415.1682629-27-willy@infradead.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-fsdevel-owner@vger.kernel.org> From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: "Theodore Tso" <tytso@mit.edu>, Andreas Dilger <adilger.kernel@dilger.ca> Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 26/31] ext4: Convert ext4_writepage() to take a folio Date: Thu, 26 Jan 2023 20:24:10 +0000 Message-Id: <20230126202415.1682629-27-willy@infradead.org> In-Reply-To: <20230126202415.1682629-1-willy@infradead.org> References: <20230126202415.1682629-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Convert most of ext4 to folios \| expand [00/31] Convert most of ext4 to folios [01/31] fs: Add FGP_WRITEBEGIN [02/31] fscrypt: Add some folio helper functions [03/31] ext4: Convert ext4_bio_write_page() to use a folio [04/31] ext4: Convert ext4_finish_bio() to use folios [05/31] ext4: Convert ext4_writepage() to use a folio [06/31] ext4: Turn mpage_process_page() into mpage_process_folio() [07/31] ext4: Convert mpage_submit_page() to mpage_submit_folio() [08/31] ext4: Convert ext4_bio_write_page() to ext4_bio_write_folio() [09/31] ext4: Convert ext4_readpage_inline() to take a folio [10/31] ext4: Convert ext4_convert_inline_data_to_extent() to use a folio [11/31] ext4: Convert ext4_try_to_write_inline_data() to use a folio [12/31] ext4: Convert ext4_da_convert_inline_data_to_extent() to use a folio [13/31] ext4: Convert ext4_da_write_inline_data_begin() to use a folio [14/31] ext4: Convert ext4_read_inline_page() to ext4_read_inline_folio() [15/31] ext4: Convert ext4_write_inline_data_end() to use a folio [16/31] ext4: Convert ext4_write_begin() to use a folio [17/31] ext4: Convert ext4_write_end() to use a folio [18/31] ext4: Use a folio in ext4_journalled_write_end() [19/31] ext4: Convert ext4_journalled_zero_new_buffers() to use a folio [20/31] ext4: Convert __ext4_block_zero_page_range() to use a folio [21/31] ext4: Convert __ext4_journalled_writepage() to take a folio [22/31] ext4: Convert ext4_page_nomap_can_writeout() to take a folio [23/31] ext4: Use a folio in ext4_da_write_begin() [24/31] ext4: Convert ext4_mpage_readpages() to work on folios [25/31] ext4: Convert ext4_block_write_begin() to take a folio [26/31] ext4: Convert ext4_writepage() to take a folio [27/31] ext4: Use a folio in ext4_page_mkwrite() [28/31] ext4: Use a folio iterator in __read_end_io() [29/31] ext4: Convert mext_page_mkuptodate() to take a folio [30/31] ext4: Convert pagecache_read() to use a folio [31/31] ext4: Use a folio in ext4_read_merkle_tree_page

Message ID

20230126202415.1682629-27-willy@infradead.org (mailing list archive)

State

New, archived

Headers

From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: "Theodore Tso" <tytso@mit.edu>,
        Andreas Dilger <adilger.kernel@dilger.ca>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
        linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 26/31] ext4: Convert ext4_writepage() to take a folio
Date: Thu, 26 Jan 2023 20:24:10 +0000
Message-Id: <20230126202415.1682629-27-willy@infradead.org>
In-Reply-To: <20230126202415.1682629-1-willy@infradead.org>
References: <20230126202415.1682629-1-willy@infradead.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Convert most of ext4 to folios | expand

Commit Message

Matthew Wilcox Jan. 26, 2023, 8:24 p.m. UTC

Its one caller already has a folio.  Saves a call to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 fs/ext4/inode.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 507c7f88d737..9bcf7459a0c0 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2015,10 +2015,9 @@  static int __ext4_journalled_writepage(struct folio *folio,
  * But since we don't do any block allocation we should not deadlock.
  * Page also have the dirty flag cleared so we don't get recurive page_lock.
  */
-static int ext4_writepage(struct page *page,
+static int ext4_writepage(struct folio *folio,
 			  struct writeback_control *wbc)
 {
-	struct folio *folio = page_folio(page);
 	int ret = 0;
 	loff_t size;
 	size_t len;
@@ -2032,7 +2031,7 @@  static int ext4_writepage(struct page *page,
 		return -EIO;
 	}
 
-	trace_ext4_writepage(page);
+	trace_ext4_writepage(&folio->page);
 	size = i_size_read(inode);
 	len = folio_size(folio);
 	if (folio_pos(folio) + len > size &&
@@ -2719,7 +2718,7 @@  static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)
 static int ext4_writepage_cb(struct folio *folio, struct writeback_control *wbc,
 			     void *data)
 {
-	return ext4_writepage(&folio->page, wbc);
+	return ext4_writepage(folio, wbc);
 }
 
 static int ext4_do_writepages(struct mpage_da_data *mpd)

[26/31] ext4: Convert ext4_writepage() to take a folio

Commit Message

Patch