aboutsummaryrefslogtreecommitdiffstats
path: root/fs/f2fs
diff options
context:
space:
mode:
authorNamjae Jeon <namjae.jeon@samsung.com>2013-02-02 23:51:51 +0900
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2013-03-18 21:00:34 +0900
commite0f56cb44b05abacb6aa8fa8695c28431e84b7a0 (patch)
tree857e17dd8c9f52c9e9b82502313049a4df84fa56 /fs/f2fs
parentf2fs: check the level before calling get_nid function (diff)
downloadlinux-dev-e0f56cb44b05abacb6aa8fa8695c28431e84b7a0.tar.xz
linux-dev-e0f56cb44b05abacb6aa8fa8695c28431e84b7a0.zip
f2fs: optimize get node page readahead part
We can remove the call to find_get_page to get a page from the cache and check for up-to-date, instead we can make use of grab_cache_page part itself to fetch the page from the cache. So, removing the call and moving the PageUptodate at proper place, also taken care of moving the lock_page condition in the page_hit part. Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com> Signed-off-by: Amit Sahrawat <a.sahrawat@samsung.com> Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/node.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index d408e69294c8..58f7216993c7 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -921,19 +921,17 @@ struct page *get_node_page_ra(struct page *parent, int start)
if (!nid)
return ERR_PTR(-ENOENT);
- page = find_get_page(mapping, nid);
- if (page && PageUptodate(page))
- goto page_hit;
- f2fs_put_page(page, 0);
-
repeat:
page = grab_cache_page(mapping, nid);
if (!page)
return ERR_PTR(-ENOMEM);
+ else if (PageUptodate(page))
+ goto page_hit;
err = read_node_page(page, READ_SYNC);
+ unlock_page(page);
if (err) {
- f2fs_put_page(page, 1);
+ f2fs_put_page(page, 0);
return ERR_PTR(err);
}
@@ -947,8 +945,9 @@ repeat:
ra_node_page(sbi, nid);
}
-page_hit:
lock_page(page);
+
+page_hit:
if (PageError(page)) {
f2fs_put_page(page, 1);
return ERR_PTR(-EIO);