diff options
| author | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2010-07-24 17:09:10 +0900 |
|---|---|---|
| committer | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2010-07-24 17:36:29 +0900 |
| commit | c28e69d9332aab739920082a0a5677d861390824 (patch) | |
| tree | b51e3cb03298c8f2d3d1443647b7a6e75af5d4c6 /fs/nilfs2 | |
| parent | c5ca48aabe8b11674bf1102abe52d17ecc053f9c (diff) | |
| download | linux-3.10-c28e69d9332aab739920082a0a5677d861390824.tar.gz linux-3.10-c28e69d9332aab739920082a0a5677d861390824.tar.bz2 linux-3.10-c28e69d9332aab739920082a0a5677d861390824.zip | |
nilfs2: simplify nilfs_get_page function
Implementation of nilfs_get_page() is a bit old as below:
- A common read_mapping_page inline function is now available instead
of its read_cache_page use.
- wait_on_page_locked() use in the function is eliminable since
read_cache_page function does the same thing through wait_on_page_read().
- PageUptodate() check is eliminable for the same reason.
This renews nilfs_get_page() based on these points.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Diffstat (limited to 'fs/nilfs2')
| -rw-r--r-- | fs/nilfs2/dir.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index 85c89dfc71f..d8d183e6d09 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c @@ -199,13 +199,10 @@ fail: static struct page *nilfs_get_page(struct inode *dir, unsigned long n) { struct address_space *mapping = dir->i_mapping; - struct page *page = read_cache_page(mapping, n, - (filler_t *)mapping->a_ops->readpage, NULL); + struct page *page = read_mapping_page(mapping, n, NULL); + if (!IS_ERR(page)) { - wait_on_page_locked(page); kmap(page); - if (!PageUptodate(page)) - goto fail; if (!PageChecked(page)) nilfs_check_page(page); if (PageError(page)) |