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

Commit 9ac1349a authored Apr 29, 2014 by Jaegeuk Kim

f2fs: avoid grab_cache_page_write_begin for data pages



We don't need to wait on page writeback for these cases.

Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>

parent 54b591df

fs/f2fs/data.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -417,7 +417,7 @@ struct page find_data_page(struct inode inode, pgoff_t index, bool sync)
	if (unlikely(dn.data_blkaddr == NEW_ADDR))		if (unlikely(dn.data_blkaddr == NEW_ADDR))
	return ERR_PTR(-EINVAL);		return ERR_PTR(-EINVAL);

	page = grab_cache_page_write_begin(mapping, index, AOP_FLAG_NOFS);		page = grab_cache_page(mapping, index);
	if (!page)		if (!page)
	return ERR_PTR(-ENOMEM);		return ERR_PTR(-ENOMEM);

	@@ -455,7 +455,7 @@ struct page get_lock_data_page(struct inode inode, pgoff_t index)
	int err;		int err;

	repeat:		repeat:
	page = grab_cache_page_write_begin(mapping, index, AOP_FLAG_NOFS);		page = grab_cache_page(mapping, index);
	if (!page)		if (!page)
	return ERR_PTR(-ENOMEM);		return ERR_PTR(-ENOMEM);

fs/f2fs/inline.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -95,6 +95,7 @@ static int __f2fs_convert_inline_data(struct inode inode, struct page page)
	if (err)		if (err)
	goto out;		goto out;

			f2fs_wait_on_page_writeback(page, DATA);
	zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);		zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);

	/* Copy the whole inline data block */		/* Copy the whole inline data block */
	@@ -133,7 +134,7 @@ int f2fs_convert_inline_data(struct inode *inode, pgoff_t to_size)
	else if (to_size <= MAX_INLINE_DATA)		else if (to_size <= MAX_INLINE_DATA)
	return 0;		return 0;

	page = grab_cache_page_write_begin(inode->i_mapping, 0, AOP_FLAG_NOFS);		page = grab_cache_page(inode->i_mapping, 0);
	if (!page)		if (!page)
	return -ENOMEM;		return -ENOMEM;