Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Jaegeuk Kim <jaegeuk@kernel.org>

+10 -9
+4 -3
fs/f2fs/checkpoint.c
··· 34 34 struct address_space *mapping = META_MAPPING(sbi); 35 35 struct page *page = NULL; 36 36 repeat: 37 - page = grab_cache_page(mapping, index); 37 + page = f2fs_grab_cache_page(mapping, index, false); 38 38 if (!page) { 39 39 cond_resched(); 40 40 goto repeat; ··· 64 64 if (unlikely(!is_meta)) 65 65 fio.rw &= ~REQ_META; 66 66 repeat: 67 - page = grab_cache_page(mapping, index); 67 + page = f2fs_grab_cache_page(mapping, index, false); 68 68 if (!page) { 69 69 cond_resched(); 70 70 goto repeat; ··· 186 186 BUG(); 187 187 } 188 188 189 - page = grab_cache_page(META_MAPPING(sbi), fio.new_blkaddr); 189 + page = f2fs_grab_cache_page(META_MAPPING(sbi), 190 + fio.new_blkaddr, false); 190 191 if (!page) 191 192 continue; 192 193 if (PageUptodate(page)) {
+2 -2
fs/f2fs/inline.c
··· 161 161 if (!f2fs_has_inline_data(inode)) 162 162 return 0; 163 163 164 - page = grab_cache_page(inode->i_mapping, 0); 164 + page = f2fs_grab_cache_page(inode->i_mapping, 0, false); 165 165 if (!page) 166 166 return -ENOMEM; 167 167 ··· 358 358 struct f2fs_dentry_block *dentry_blk; 359 359 int err; 360 360 361 - page = grab_cache_page(dir->i_mapping, 0); 361 + page = f2fs_grab_cache_page(dir->i_mapping, 0, false); 362 362 if (!page) { 363 363 f2fs_put_page(ipage, 1); 364 364 return -ENOMEM;
+4 -4
fs/f2fs/node.c
··· 995 995 if (unlikely(is_inode_flag_set(F2FS_I(dn->inode), FI_NO_ALLOC))) 996 996 return ERR_PTR(-EPERM); 997 997 998 - page = grab_cache_page(NODE_MAPPING(sbi), dn->nid); 998 + page = f2fs_grab_cache_page(NODE_MAPPING(sbi), dn->nid, false); 999 999 if (!page) 1000 1000 return ERR_PTR(-ENOMEM); 1001 1001 ··· 1087 1087 if (apage) 1088 1088 return; 1089 1089 1090 - apage = grab_cache_page(NODE_MAPPING(sbi), nid); 1090 + apage = f2fs_grab_cache_page(NODE_MAPPING(sbi), nid, false); 1091 1091 if (!apage) 1092 1092 return; 1093 1093 ··· 1128 1128 return ERR_PTR(-ENOENT); 1129 1129 f2fs_bug_on(sbi, check_nid_range(sbi, nid)); 1130 1130 repeat: 1131 - page = grab_cache_page(NODE_MAPPING(sbi), nid); 1131 + page = f2fs_grab_cache_page(NODE_MAPPING(sbi), nid, false); 1132 1132 if (!page) 1133 1133 return ERR_PTR(-ENOMEM); 1134 1134 ··· 2012 2012 if (unlikely(old_ni.blk_addr != NULL_ADDR)) 2013 2013 return -EINVAL; 2014 2014 2015 - ipage = grab_cache_page(NODE_MAPPING(sbi), ino); 2015 + ipage = f2fs_grab_cache_page(NODE_MAPPING(sbi), ino, false); 2016 2016 if (!ipage) 2017 2017 return -ENOMEM; 2018 2018