From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 28 May 2010 15:34:50 +0000 (-0400)
Subject: remove detritus left by "mm: make read_cache_page synchronous"
X-Git-Tag: v2.6.35-rc1~27^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=49837a80b38b79a7c06217b2c40842aeb6fa13b9;p=users%2Fhch%2Fblock.git

remove detritus left by "mm: make read_cache_page synchronous"

gets minix get_dir_page() in sync with its analogs; back in 2007
Nick has switched read_cache_page() and friends to sync behaviour
(i.e.  they wait for the page to get unlocked, check if it's uptodate
and if it isn't return ERR_PTR(-EIO) instead) and removed the
duplicate logics from the callers.  In case of fs/minix/dir.c he'd
removed only half of that...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index aaab97ec5bc0..91969589131c 100644
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -72,11 +72,8 @@ static struct page * dir_get_page(struct inode *dir, unsigned long n)
 {
 	struct address_space *mapping = dir->i_mapping;
 	struct page *page = read_mapping_page(mapping, n, NULL);
-	if (!IS_ERR(page)) {
+	if (!IS_ERR(page))
 		kmap(page);
-		if (!PageUptodate(page))
-			goto fail;
-	}
 	return page;
 
 fail: