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

Commit fec1d657 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: use wait_for_stable_page to avoid contention 



In write_begin, if storage supports stable_page, we don't need to wait for
writeback to update its contents.
This patch introduces to use wait_for_stable_page instead of
wait_on_page_writeback.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 718e53fa

fs/f2fs/checkpoint.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct page *grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index) 
		cond_resched();

		goto repeat;

	}

	f2fs_wait_on_page_writeback(page, META);

	f2fs_wait_on_page_writeback(page, META, true);

	SetPageUptodate(page);

	return page;

}
@@ -232,7 +232,7 @@ static int f2fs_write_meta_page(struct page *page, 
	if (unlikely(f2fs_cp_error(sbi)))

		goto redirty_out;



	f2fs_wait_on_page_writeback(page, META);

	f2fs_wait_on_page_writeback(page, META, true);

	write_meta_page(sbi, page);

	dec_page_count(sbi, F2FS_DIRTY_META);

	unlock_page(page);

fs/f2fs/data.c

+4 −3
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ void set_data_blkaddr(struct dnode_of_data *dn) 
	struct page *node_page = dn->node_page;

	unsigned int ofs_in_node = dn->ofs_in_node;



	f2fs_wait_on_page_writeback(node_page, NODE);

	f2fs_wait_on_page_writeback(node_page, NODE, true);



	rn = F2FS_NODE(node_page);
@@ -1319,7 +1319,8 @@ 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);

					f2fs_wait_on_page_writeback(page,

								DATA, true);

				else

					goto continue_unlock;

			}
@@ -1547,7 +1548,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, 
		}

	}



	f2fs_wait_on_page_writeback(page, DATA);

	f2fs_wait_on_page_writeback(page, DATA, false);



	/* wait for GCed encrypted page writeback */

	if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))

fs/f2fs/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -296,7 +296,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);

	f2fs_wait_on_page_writeback(page, type, true);

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

	set_de_type(de, inode->i_mode);

	f2fs_dentry_kunmap(dir, page);
@@ -311,7 +311,7 @@ static void init_dent_inode(const struct qstr *name, struct page *ipage) 
{

	struct f2fs_inode *ri;



	f2fs_wait_on_page_writeback(ipage, NODE);

	f2fs_wait_on_page_writeback(ipage, NODE, true);



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

	ri = F2FS_INODE(ipage);
@@ -598,7 +598,7 @@ int __f2fs_add_link(struct inode *dir, const struct qstr *name, 
	++level;

	goto start;

add_dentry:

	f2fs_wait_on_page_writeback(dentry_page, DATA);

	f2fs_wait_on_page_writeback(dentry_page, DATA, true);



	if (inode) {

		down_write(&F2FS_I(inode)->i_sem);
@@ -709,7 +709,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);

	f2fs_wait_on_page_writeback(page, DATA, 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
@@ -1837,7 +1837,7 @@ void f2fs_replace_block(struct f2fs_sb_info *, struct dnode_of_data *, 
				block_t, block_t, unsigned char, bool);

void allocate_data_block(struct f2fs_sb_info *, struct page *,

		block_t, block_t *, struct f2fs_summary *, int);

void f2fs_wait_on_page_writeback(struct page *, enum page_type);

void f2fs_wait_on_page_writeback(struct page *, enum page_type, bool);

void f2fs_wait_on_encrypted_page_writeback(struct f2fs_sb_info *, block_t);

void write_data_summaries(struct f2fs_sb_info *, block_t);

void write_node_summaries(struct f2fs_sb_info *, block_t);

fs/f2fs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma, 
	trace_f2fs_vm_page_mkwrite(page, DATA);

mapped:

	/* fill the page */

	f2fs_wait_on_page_writeback(page, DATA);

	f2fs_wait_on_page_writeback(page, DATA, false);



	/* wait for GCed encrypted page writeback */

	if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))
@@ -521,7 +521,7 @@ static int truncate_partial_data_page(struct inode *inode, u64 from, 
	if (IS_ERR(page))

		return 0;

truncate_out:

	f2fs_wait_on_page_writeback(page, DATA);

	f2fs_wait_on_page_writeback(page, DATA, true);

	zero_user(page, offset, PAGE_CACHE_SIZE - offset);

	if (!cache_only || !f2fs_encrypted_inode(inode) || !S_ISREG(inode->i_mode))

		set_page_dirty(page);
@@ -743,7 +743,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);

	f2fs_wait_on_page_writeback(page, DATA, true);

	zero_user(page, start, len);

	set_page_dirty(page);

	f2fs_put_page(page, 1);