diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-05-28 11:34:50 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-05-28 11:37:41 -0400 |
commit | 49837a80b38b79a7c06217b2c40842aeb6fa13b9 (patch) | |
tree | f7d1cdf2f8c5875114d1db3d38c2bb6509c9ed68 /fs/minix/dir.c | |
parent | 4c9002de329c9ae825f10eb9044c928434a4d230 (diff) |
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/minix/dir.c')
-rw-r--r-- | fs/minix/dir.c | 5 |
1 files changed, 1 insertions, 4 deletions
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) | |||
72 | { | 72 | { |
73 | struct address_space *mapping = dir->i_mapping; | 73 | struct address_space *mapping = dir->i_mapping; |
74 | struct page *page = read_mapping_page(mapping, n, NULL); | 74 | struct page *page = read_mapping_page(mapping, n, NULL); |
75 | if (!IS_ERR(page)) { | 75 | if (!IS_ERR(page)) |
76 | kmap(page); | 76 | kmap(page); |
77 | if (!PageUptodate(page)) | ||
78 | goto fail; | ||
79 | } | ||
80 | return page; | 77 | return page; |
81 | 78 | ||
82 | fail: | 79 | fail: |