Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94a963ed authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: check PageWriteback flag for ordered case 



For all ordered cases in f2fs_wait_on_page_writeback(), we need to
check PageWriteback status, so let's clean up to relocate the check
into f2fs_wait_on_page_writeback().

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent b2df1e3f

fs/f2fs/checkpoint.c

+3 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct page *f2fs_grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index) 
		cond_resched();

		goto repeat;

	}

	f2fs_wait_on_page_writeback(page, META, true);

	f2fs_wait_on_page_writeback(page, META, true, true);

	if (!PageUptodate(page))

		SetPageUptodate(page);

	return page;
@@ -370,9 +370,8 @@ long f2fs_sync_meta_pages(struct f2fs_sb_info *sbi, enum page_type type, 
				goto continue_unlock;

			}



			f2fs_wait_on_page_writeback(page, META, true);

			f2fs_wait_on_page_writeback(page, META, true, true);



			BUG_ON(PageWriteback(page));

			if (!clear_page_dirty_for_io(page))

				goto continue_unlock;
@@ -1290,8 +1289,7 @@ static void commit_checkpoint(struct f2fs_sb_info *sbi, 
	struct page *page = f2fs_grab_meta_page(sbi, blk_addr);

	int err;



	f2fs_wait_on_page_writeback(page, META, true);

	f2fs_bug_on(sbi, PageWriteback(page));

	f2fs_wait_on_page_writeback(page, META, true, true);



	memcpy(page_address(page), src, PAGE_SIZE);

fs/f2fs/data.c

+4 −5
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static void __set_data_blkaddr(struct dnode_of_data *dn) 
 */

void f2fs_set_data_blkaddr(struct dnode_of_data *dn)

{

	f2fs_wait_on_page_writeback(dn->node_page, NODE, true);

	f2fs_wait_on_page_writeback(dn->node_page, NODE, true, true);

	__set_data_blkaddr(dn);

	if (set_page_dirty(dn->node_page))

		dn->node_changed = true;
@@ -655,7 +655,7 @@ int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count) 
	trace_f2fs_reserve_new_blocks(dn->inode, dn->nid,

						dn->ofs_in_node, count);



	f2fs_wait_on_page_writeback(dn->node_page, NODE, true);

	f2fs_wait_on_page_writeback(dn->node_page, NODE, true, true);



	for (; count > 0; dn->ofs_in_node++) {

		block_t blkaddr = datablock_addr(dn->inode,
@@ -2148,12 +2148,11 @@ static int f2fs_write_cache_pages(struct address_space *mapping, 
			if (PageWriteback(page)) {

				if (wbc->sync_mode != WB_SYNC_NONE)

					f2fs_wait_on_page_writeback(page,

								DATA, true);

							DATA, true, true);

				else

					goto continue_unlock;

			}



			BUG_ON(PageWriteback(page));

			if (!clear_page_dirty_for_io(page))

				goto continue_unlock;
@@ -2471,7 +2470,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, 
		}

	}



	f2fs_wait_on_page_writeback(page, DATA, false);

	f2fs_wait_on_page_writeback(page, DATA, false, true);



	if (len == PAGE_SIZE || PageUptodate(page))

		return 0;

fs/f2fs/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de, 
{

	enum page_type type = f2fs_has_inline_dentry(dir) ? NODE : DATA;

	lock_page(page);

	f2fs_wait_on_page_writeback(page, type, true);

	f2fs_wait_on_page_writeback(page, type, true, true);

	de->ino = cpu_to_le32(inode->i_ino);

	set_de_type(de, inode->i_mode);

	set_page_dirty(page);
@@ -307,7 +307,7 @@ static void init_dent_inode(const struct qstr *name, struct page *ipage) 
{

	struct f2fs_inode *ri;



	f2fs_wait_on_page_writeback(ipage, NODE, true);

	f2fs_wait_on_page_writeback(ipage, NODE, true, true);



	/* copy name info. to this inode page */

	ri = F2FS_INODE(ipage);
@@ -550,7 +550,7 @@ int f2fs_add_regular_entry(struct inode *dir, const struct qstr *new_name, 
	++level;

	goto start;

add_dentry:

	f2fs_wait_on_page_writeback(dentry_page, DATA, true);

	f2fs_wait_on_page_writeback(dentry_page, DATA, true, true);



	if (inode) {

		down_write(&F2FS_I(inode)->i_sem);
@@ -705,7 +705,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, 
		return f2fs_delete_inline_entry(dentry, page, dir, inode);



	lock_page(page);

	f2fs_wait_on_page_writeback(page, DATA, true);

	f2fs_wait_on_page_writeback(page, DATA, true, true);



	dentry_blk = page_address(page);

	bit_pos = dentry - dentry_blk->dentry;

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -3039,7 +3039,7 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, 
			struct f2fs_summary *sum, int type,

			struct f2fs_io_info *fio, bool add_list);

void f2fs_wait_on_page_writeback(struct page *page,

			enum page_type type, bool ordered);

			enum page_type type, bool ordered, bool locked);

void f2fs_wait_on_block_writeback(struct inode *inode, block_t blkaddr);

void f2fs_wait_on_block_writeback_range(struct inode *inode, block_t blkaddr,

								block_t len);

fs/f2fs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int f2fs_vm_page_mkwrite(struct vm_fault *vmf) 
	}



	/* fill the page */

	f2fs_wait_on_page_writeback(page, DATA, false);

	f2fs_wait_on_page_writeback(page, DATA, false, true);



	/* wait for GCed page writeback via META_MAPPING */

	f2fs_wait_on_block_writeback(inode, dn.data_blkaddr);
@@ -578,7 +578,7 @@ static int truncate_partial_data_page(struct inode *inode, u64 from, 
	if (IS_ERR(page))

		return PTR_ERR(page) == -ENOENT ? 0 : PTR_ERR(page);

truncate_out:

	f2fs_wait_on_page_writeback(page, DATA, true);

	f2fs_wait_on_page_writeback(page, DATA, true, true);

	zero_user(page, offset, PAGE_SIZE - offset);



	/* An encrypted inode should have a key and truncate the last page. */
@@ -895,7 +895,7 @@ static int fill_zero(struct inode *inode, pgoff_t index, 
	if (IS_ERR(page))

		return PTR_ERR(page);



	f2fs_wait_on_page_writeback(page, DATA, true);

	f2fs_wait_on_page_writeback(page, DATA, true, true);

	zero_user(page, start, len);

	set_page_dirty(page);

	f2fs_put_page(page, 1);