Commit 4d5cdd75 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Theodore Ts'o

ext4: convert ext4_da_do_write_end() to take a folio

There's nothing page-specific happening in ext4_da_do_write_end();
it's merely used for its refcount & lock, both of which are folio
properties.  Saves four calls to compound_head().
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20231214053035.1018876-1-willy@infradead.orgSigned-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 7c784d62
...@@ -2947,7 +2947,7 @@ static int ext4_da_should_update_i_disksize(struct folio *folio, ...@@ -2947,7 +2947,7 @@ static int ext4_da_should_update_i_disksize(struct folio *folio,
static int ext4_da_do_write_end(struct address_space *mapping, static int ext4_da_do_write_end(struct address_space *mapping,
loff_t pos, unsigned len, unsigned copied, loff_t pos, unsigned len, unsigned copied,
struct page *page) struct folio *folio)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
loff_t old_size = inode->i_size; loff_t old_size = inode->i_size;
...@@ -2958,12 +2958,13 @@ static int ext4_da_do_write_end(struct address_space *mapping, ...@@ -2958,12 +2958,13 @@ static int ext4_da_do_write_end(struct address_space *mapping,
* block_write_end() will mark the inode as dirty with I_DIRTY_PAGES * block_write_end() will mark the inode as dirty with I_DIRTY_PAGES
* flag, which all that's needed to trigger page writeback. * flag, which all that's needed to trigger page writeback.
*/ */
copied = block_write_end(NULL, mapping, pos, len, copied, page, NULL); copied = block_write_end(NULL, mapping, pos, len, copied,
&folio->page, NULL);
new_i_size = pos + copied; new_i_size = pos + copied;
/* /*
* It's important to update i_size while still holding page lock, * It's important to update i_size while still holding folio lock,
* because page writeout could otherwise come in and zero beyond * because folio writeout could otherwise come in and zero beyond
* i_size. * i_size.
* *
* Since we are holding inode lock, we are sure i_disksize <= * Since we are holding inode lock, we are sure i_disksize <=
...@@ -2981,14 +2982,14 @@ static int ext4_da_do_write_end(struct address_space *mapping, ...@@ -2981,14 +2982,14 @@ static int ext4_da_do_write_end(struct address_space *mapping,
i_size_write(inode, new_i_size); i_size_write(inode, new_i_size);
end = (new_i_size - 1) & (PAGE_SIZE - 1); end = (new_i_size - 1) & (PAGE_SIZE - 1);
if (copied && ext4_da_should_update_i_disksize(page_folio(page), end)) { if (copied && ext4_da_should_update_i_disksize(folio, end)) {
ext4_update_i_disksize(inode, new_i_size); ext4_update_i_disksize(inode, new_i_size);
disksize_changed = true; disksize_changed = true;
} }
} }
unlock_page(page); folio_unlock(folio);
put_page(page); folio_put(folio);
if (old_size < pos) if (old_size < pos)
pagecache_isize_extended(inode, old_size, pos); pagecache_isize_extended(inode, old_size, pos);
...@@ -3027,10 +3028,10 @@ static int ext4_da_write_end(struct file *file, ...@@ -3027,10 +3028,10 @@ static int ext4_da_write_end(struct file *file,
return ext4_write_inline_data_end(inode, pos, len, copied, return ext4_write_inline_data_end(inode, pos, len, copied,
folio); folio);
if (unlikely(copied < len) && !PageUptodate(page)) if (unlikely(copied < len) && !folio_test_uptodate(folio))
copied = 0; copied = 0;
return ext4_da_do_write_end(mapping, pos, len, copied, &folio->page); return ext4_da_do_write_end(mapping, pos, len, copied, folio);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment