From 2cac8bdd3f57b6b338b9c4d6e2accf60022defef Mon Sep 17 00:00:00 2001 From: Ryusuke Konishi Date: Sat, 24 Jul 2010 17:09:10 +0900 Subject: [PATCH] --- yaml --- r: 206370 b: refs/heads/master c: c28e69d9332aab739920082a0a5677d861390824 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nilfs2/dir.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index cbd8fdb5cf62..4e246b698604 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5ca48aabe8b11674bf1102abe52d17ecc053f9c +refs/heads/master: c28e69d9332aab739920082a0a5677d861390824 diff --git a/trunk/fs/nilfs2/dir.c b/trunk/fs/nilfs2/dir.c index 85c89dfc71f0..d8d183e6d095 100644 --- a/trunk/fs/nilfs2/dir.c +++ b/trunk/fs/nilfs2/dir.c @@ -199,13 +199,10 @@ static void nilfs_check_page(struct page *page) 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))