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

Commit 300e129c authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: use f2fs_grab_cache_page instead of grab_cache_page 



This patch converts grab_cache_page to f2fs_grab_cache_page.

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

fs/f2fs/checkpoint.c

+4 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct page *grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index) 
	struct address_space *mapping = META_MAPPING(sbi);

	struct page *page = NULL;

repeat:

	page = grab_cache_page(mapping, index);

	page = f2fs_grab_cache_page(mapping, index, false);

	if (!page) {

		cond_resched();

		goto repeat;
@@ -64,7 +64,7 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index, 
	if (unlikely(!is_meta))

		fio.rw &= ~REQ_META;

repeat:

	page = grab_cache_page(mapping, index);

	page = f2fs_grab_cache_page(mapping, index, false);

	if (!page) {

		cond_resched();

		goto repeat;
@@ -186,7 +186,8 @@ int ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, 
			BUG();

		}



		page = grab_cache_page(META_MAPPING(sbi), fio.new_blkaddr);

		page = f2fs_grab_cache_page(META_MAPPING(sbi),

						fio.new_blkaddr, false);

		if (!page)

			continue;

		if (PageUptodate(page)) {

fs/f2fs/inline.c

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ int f2fs_convert_inline_inode(struct inode *inode) 
	if (!f2fs_has_inline_data(inode))

		return 0;



	page = grab_cache_page(inode->i_mapping, 0);

	page = f2fs_grab_cache_page(inode->i_mapping, 0, false);

	if (!page)

		return -ENOMEM;
@@ -358,7 +358,7 @@ static int f2fs_move_inline_dirents(struct inode *dir, struct page *ipage, 
	struct f2fs_dentry_block *dentry_blk;

	int err;



	page = grab_cache_page(dir->i_mapping, 0);

	page = f2fs_grab_cache_page(dir->i_mapping, 0, false);

	if (!page) {

		f2fs_put_page(ipage, 1);

		return -ENOMEM;

fs/f2fs/node.c

+4 −4
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ struct page *new_node_page(struct dnode_of_data *dn, 
	if (unlikely(is_inode_flag_set(F2FS_I(dn->inode), FI_NO_ALLOC)))

		return ERR_PTR(-EPERM);



	page = grab_cache_page(NODE_MAPPING(sbi), dn->nid);

	page = f2fs_grab_cache_page(NODE_MAPPING(sbi), dn->nid, false);

	if (!page)

		return ERR_PTR(-ENOMEM);
@@ -1087,7 +1087,7 @@ void ra_node_page(struct f2fs_sb_info *sbi, nid_t nid) 
	if (apage)

		return;



	apage = grab_cache_page(NODE_MAPPING(sbi), nid);

	apage = f2fs_grab_cache_page(NODE_MAPPING(sbi), nid, false);

	if (!apage)

		return;
@@ -1128,7 +1128,7 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, 
		return ERR_PTR(-ENOENT);

	f2fs_bug_on(sbi, check_nid_range(sbi, nid));

repeat:

	page = grab_cache_page(NODE_MAPPING(sbi), nid);

	page = f2fs_grab_cache_page(NODE_MAPPING(sbi), nid, false);

	if (!page)

		return ERR_PTR(-ENOMEM);
@@ -2012,7 +2012,7 @@ int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page) 
	if (unlikely(old_ni.blk_addr != NULL_ADDR))

		return -EINVAL;



	ipage = grab_cache_page(NODE_MAPPING(sbi), ino);

	ipage = f2fs_grab_cache_page(NODE_MAPPING(sbi), ino, false);

	if (!ipage)

		return -ENOMEM;