summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-05-28 11:34:50 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-05-28 11:37:41 -0400
commit49837a80b38b79a7c06217b2c40842aeb6fa13b9 (patch)
treef7d1cdf2f8c5875114d1db3d38c2bb6509c9ed68 /fs
parent4c9002de329c9ae825f10eb9044c928434a4d230 (diff)
downloadop-kernel-dev-49837a80b38b79a7c06217b2c40842aeb6fa13b9.zip
op-kernel-dev-49837a80b38b79a7c06217b2c40842aeb6fa13b9.tar.gz
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/minix/dir.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index aaab97ec..9196958 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:
OpenPOWER on IntegriCloud