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

f2fs: Convert f2fs_write_end() to use a folio 



Convert the passed page to a folio and operate on that.
Replaces five 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 6a09084c

fs/f2fs/data.c

+8 −6
Original line number Diff line number Diff line
@@ -3687,7 +3687,8 @@ static int f2fs_write_end(struct file *file, 
			loff_t pos, unsigned len, unsigned copied,

			struct page *page, void *fsdata)

{

	struct inode *inode = page->mapping->host;

	struct folio *folio = page_folio(page);

	struct inode *inode = folio->mapping->host;



	trace_f2fs_write_end(inode, pos, len, copied);
@@ -3696,17 +3697,17 @@ static int f2fs_write_end(struct file *file, 
	 * should be PAGE_SIZE. Otherwise, we treat it with zero copied and

	 * let generic_perform_write() try to copy data again through copied=0.

	 */

	if (!PageUptodate(page)) {

	if (!folio_test_uptodate(folio)) {

		if (unlikely(copied != len))

			copied = 0;

		else

			SetPageUptodate(page);

			folio_mark_uptodate(folio);

	}



#ifdef CONFIG_F2FS_FS_COMPRESSION

	/* overwrite compressed file */

	if (f2fs_compressed_file(inode) && fsdata) {

		f2fs_compress_write_end(inode, fsdata, page->index, copied);

		f2fs_compress_write_end(inode, fsdata, folio->index, copied);

		f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);



		if (pos + copied > i_size_read(inode) &&
@@ -3719,7 +3720,7 @@ static int f2fs_write_end(struct file *file, 
	if (!copied)

		goto unlock_out;



	set_page_dirty(page);

	folio_mark_dirty(folio);



	if (pos + copied > i_size_read(inode) &&

	    !f2fs_verity_in_progress(inode)) {
@@ -3729,7 +3730,8 @@ static int f2fs_write_end(struct file *file, 
					pos + copied);

	}

unlock_out:

	f2fs_put_page(page, 1);

	folio_unlock(folio);

	folio_put(folio);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

	return copied;

}