Commit cb0de0e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'f2fs-for-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs 

Pull f2fs fixes from Jaegeuk Kim:

 - fix double-unlock introduced by the recent folio conversion

 - fix stale page content beyond EOF complained by xfstests/generic/363

* tag 'f2fs-for-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs:
  f2fs: fix to zero post-eof page
  f2fs: Fix __write_node_folio() conversion
parents 5ca7fe21 ba8dac35

fs/f2fs/file.c

+38 −0
Original line number Diff line number Diff line
@@ -35,6 +35,17 @@ 
#include <trace/events/f2fs.h>

#include <uapi/linux/f2fs.h>



static void f2fs_zero_post_eof_page(struct inode *inode, loff_t new_size)

{

	loff_t old_size = i_size_read(inode);



	if (old_size >= new_size)

		return;



	/* zero or drop pages only in range of [old_size, new_size] */

	truncate_pagecache(inode, old_size);

}



static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf)

{

	struct inode *inode = file_inode(vmf->vma->vm_file);
@@ -103,8 +114,13 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) 


	f2fs_bug_on(sbi, f2fs_has_inline_data(inode));



	filemap_invalidate_lock(inode->i_mapping);

	f2fs_zero_post_eof_page(inode, (folio->index + 1) << PAGE_SHIFT);

	filemap_invalidate_unlock(inode->i_mapping);



	file_update_time(vmf->vma->vm_file);

	filemap_invalidate_lock_shared(inode->i_mapping);



	folio_lock(folio);

	if (unlikely(folio->mapping != inode->i_mapping ||

			folio_pos(folio) > i_size_read(inode) ||
@@ -1109,6 +1125,8 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry, 
		f2fs_down_write(&fi->i_gc_rwsem[WRITE]);

		filemap_invalidate_lock(inode->i_mapping);



		if (attr->ia_size > old_size)

			f2fs_zero_post_eof_page(inode, attr->ia_size);

		truncate_setsize(inode, attr->ia_size);



		if (attr->ia_size <= old_size)
@@ -1227,6 +1245,10 @@ static int f2fs_punch_hole(struct inode *inode, loff_t offset, loff_t len) 
	if (ret)

		return ret;



	filemap_invalidate_lock(inode->i_mapping);

	f2fs_zero_post_eof_page(inode, offset + len);

	filemap_invalidate_unlock(inode->i_mapping);



	pg_start = ((unsigned long long) offset) >> PAGE_SHIFT;

	pg_end = ((unsigned long long) offset + len) >> PAGE_SHIFT;
@@ -1510,6 +1532,8 @@ static int f2fs_do_collapse(struct inode *inode, loff_t offset, loff_t len) 
	f2fs_down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);

	filemap_invalidate_lock(inode->i_mapping);



	f2fs_zero_post_eof_page(inode, offset + len);



	f2fs_lock_op(sbi);

	f2fs_drop_extent_tree(inode);

	truncate_pagecache(inode, offset);
@@ -1631,6 +1655,10 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len, 
	if (ret)

		return ret;



	filemap_invalidate_lock(mapping);

	f2fs_zero_post_eof_page(inode, offset + len);

	filemap_invalidate_unlock(mapping);



	pg_start = ((unsigned long long) offset) >> PAGE_SHIFT;

	pg_end = ((unsigned long long) offset + len) >> PAGE_SHIFT;
@@ -1762,6 +1790,8 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len) 
	/* avoid gc operation during block exchange */

	f2fs_down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);

	filemap_invalidate_lock(mapping);



	f2fs_zero_post_eof_page(inode, offset + len);

	truncate_pagecache(inode, offset);



	while (!ret && idx > pg_start) {
@@ -1819,6 +1849,10 @@ static int f2fs_expand_inode_data(struct inode *inode, loff_t offset, 
	if (err)

		return err;



	filemap_invalidate_lock(inode->i_mapping);

	f2fs_zero_post_eof_page(inode, offset + len);

	filemap_invalidate_unlock(inode->i_mapping);



	f2fs_balance_fs(sbi, true);



	pg_start = ((unsigned long long)offset) >> PAGE_SHIFT;
@@ -4860,6 +4894,10 @@ static ssize_t f2fs_write_checks(struct kiocb *iocb, struct iov_iter *from) 
	err = file_modified(file);

	if (err)

		return err;



	filemap_invalidate_lock(inode->i_mapping);

	f2fs_zero_post_eof_page(inode, iocb->ki_pos + iov_iter_count(from));

	filemap_invalidate_unlock(inode->i_mapping);

	return count;

}

fs/f2fs/node.c

+0 −1
Original line number Diff line number Diff line
@@ -2078,7 +2078,6 @@ int f2fs_sync_node_pages(struct f2fs_sb_info *sbi, 


			if (!__write_node_folio(folio, false, &submitted,

					wbc, do_balance, io_type, NULL)) {

				folio_unlock(folio);

				folio_batch_release(&fbatch);

				ret = -EIO;

				goto out;