projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: make read_cache_page synchronous
[powerpc.git]
/
fs
/
ntfs
/
aops.h
diff --git
a/fs/ntfs/aops.h
b/fs/ntfs/aops.h
index
3b74e66
..
caecc58
100644
(file)
--- a/
fs/ntfs/aops.h
+++ b/
fs/ntfs/aops.h
@@
-80,19
+80,17
@@
static inline void ntfs_unmap_page(struct page *page)
*
* The unlocked and uptodate page is returned on success or an encoded error
* on failure. Caller has to test for error using the IS_ERR() macro on the
*
* The unlocked and uptodate page is returned on success or an encoded error
* on failure. Caller has to test for error using the IS_ERR() macro on the
- * return value. If that evaluates to
TRUE
, the negative error code can be
+ * return value. If that evaluates to
'true'
, the negative error code can be
* obtained using PTR_ERR() on the return value of ntfs_map_page().
*/
static inline struct page *ntfs_map_page(struct address_space *mapping,
unsigned long index)
{
* obtained using PTR_ERR() on the return value of ntfs_map_page().
*/
static inline struct page *ntfs_map_page(struct address_space *mapping,
unsigned long index)
{
- struct page *page = read_cache_page(mapping, index,
- (filler_t*)mapping->a_ops->readpage, NULL);
+ struct page *page = read_mapping_page(mapping, index, NULL);
if (!IS_ERR(page)) {
if (!IS_ERR(page)) {
- wait_on_page_locked(page);
kmap(page);
kmap(page);
- if (
PageUptodate(page) &&
!PageError(page))
+ if (!PageError(page))
return page;
ntfs_unmap_page(page);
return ERR_PTR(-EIO);
return page;
ntfs_unmap_page(page);
return ERR_PTR(-EIO);