---

yaml --- r: 206370 b: refs/heads/master c: c28e69d h: refs/heads/master v: v3
git-mirror · Jul 24, 2010 · 2cac8bd · 2cac8bd
1 parent efdfc3e
commit 2cac8bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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))