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

buffer: Use a folio in generic_write_end() 



Replaces two implicit calls to compound_head() with one.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 1262249d

fs/buffer.c

+4 −3
Original line number Diff line number Diff line
@@ -2283,6 +2283,7 @@ int generic_write_end(struct file *file, struct address_space *mapping, 
			loff_t pos, unsigned len, unsigned copied,

			struct page *page, void *fsdata)

{

	struct folio *folio = page_folio(page);

	struct inode *inode = mapping->host;

	loff_t old_size = inode->i_size;

	bool i_size_changed = false;
@@ -2293,7 +2294,7 @@ int generic_write_end(struct file *file, struct address_space *mapping, 
	 * No need to use i_size_read() here, the i_size cannot change under us

	 * because we hold i_rwsem.

	 *

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

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

	 * page writeout could otherwise come in and zero beyond i_size.

	 */

	if (pos + copied > inode->i_size) {
@@ -2301,8 +2302,8 @@ int generic_write_end(struct file *file, struct address_space *mapping, 
		i_size_changed = true;

	}



	unlock_page(page);

	put_page(page);

	folio_unlock(folio);

	folio_put(folio);



	if (old_size < pos)

		pagecache_isize_extended(inode, old_size, pos);