Unverified Commit b39f7d75 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Christian Brauner
Browse files

fs: Remove three arguments from block_write_end() 



block_write_end() looks like it can be used as a ->write_end()
implementation.  However, it can't as it does not unlock nor put
the folio.  Since it does not use the 'file', 'mapping' nor 'fsdata'
arguments, remove them.

Signed-off-by: default avatar"Matthew Wilcox (Oracle)" <willy@infradead.org>
Link: https://lore.kernel.org/20250624132130.1590285-1-willy@infradead.org


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 06a70535

block/fops.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static int blkdev_write_end(struct file *file, struct address_space *mapping, 
		void *fsdata)

{

	int ret;

	ret = block_write_end(file, mapping, pos, len, copied, folio, fsdata);

	ret = block_write_end(pos, len, copied, folio);



	folio_unlock(folio);

	folio_put(folio);

fs/buffer.c

+3 −4
Original line number Diff line number Diff line
@@ -2270,9 +2270,8 @@ int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len, 
}

EXPORT_SYMBOL(block_write_begin);



int block_write_end(struct file *file, struct address_space *mapping,

			loff_t pos, unsigned len, unsigned copied,

			struct folio *folio, void *fsdata)

int block_write_end(loff_t pos, unsigned len, unsigned copied,

		struct folio *folio)

{

	size_t start = pos - folio_pos(folio);
@@ -2311,7 +2310,7 @@ int generic_write_end(struct file *file, struct address_space *mapping, 
	loff_t old_size = inode->i_size;

	bool i_size_changed = false;



	copied = block_write_end(file, mapping, pos, len, copied, folio, fsdata);

	copied = block_write_end(pos, len, copied, folio);



	/*

	 * No need to use i_size_read() here, the i_size cannot change under us

fs/ext2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void ext2_commit_chunk(struct folio *folio, loff_t pos, unsigned len) 
	struct inode *dir = mapping->host;



	inode_inc_iversion(dir);

	block_write_end(NULL, mapping, pos, len, len, folio, NULL);

	block_write_end(pos, len, len, folio);



	if (pos+len > dir->i_size) {

		i_size_write(dir, pos+len);

fs/ext4/inode.c

+2 −3
Original line number Diff line number Diff line
@@ -1424,7 +1424,7 @@ static int ext4_write_end(struct file *file, 
		return ext4_write_inline_data_end(inode, pos, len, copied,

						  folio);



	copied = block_write_end(file, mapping, pos, len, copied, folio, fsdata);

	copied = block_write_end(pos, len, copied, folio);

	/*

	 * it's important to update i_size while still holding folio lock:

	 * page writeout could otherwise come in and zero beyond i_size.
@@ -3144,8 +3144,7 @@ static int ext4_da_do_write_end(struct address_space *mapping, 
	 * block_write_end() will mark the inode as dirty with I_DIRTY_PAGES

	 * flag, which all that's needed to trigger page writeback.

	 */

	copied = block_write_end(NULL, mapping, pos, len, copied,

			folio, NULL);

	copied = block_write_end(pos, len, copied, folio);

	new_i_size = pos + copied;



	/*

fs/iomap/buffered-io.c

+1 −2
Original line number Diff line number Diff line
@@ -923,8 +923,7 @@ static bool iomap_write_end(struct iomap_iter *iter, size_t len, size_t copied, 
	if (srcmap->flags & IOMAP_F_BUFFER_HEAD) {

		size_t bh_written;



		bh_written = block_write_end(NULL, iter->inode->i_mapping, pos,

					len, copied, folio, NULL);

		bh_written = block_write_end(pos, len, copied, folio);

		WARN_ON_ONCE(bh_written != copied && bh_written != 0);

		return bh_written == copied;

	}