diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
| commit | bbe5d235ee201705530a7153b57e141cd77d818b (patch) | |
| tree | e98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /fs/ntfs/aops.h | |
| parent | 189acaaef81b1d71aedd0d28810de24160c2e781 (diff) | |
| parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/ntfs/aops.h')
| -rw-r--r-- | fs/ntfs/aops.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ntfs/aops.h b/fs/ntfs/aops.h index 3b74e66ca2ff..325ce261a107 100644 --- a/fs/ntfs/aops.h +++ b/fs/ntfs/aops.h | |||
| @@ -86,8 +86,7 @@ static inline void ntfs_unmap_page(struct page *page) | |||
| 86 | static inline struct page *ntfs_map_page(struct address_space *mapping, | 86 | static inline struct page *ntfs_map_page(struct address_space *mapping, |
| 87 | unsigned long index) | 87 | unsigned long index) |
| 88 | { | 88 | { |
| 89 | struct page *page = read_cache_page(mapping, index, | 89 | struct page *page = read_mapping_page(mapping, index, NULL); |
| 90 | (filler_t*)mapping->a_ops->readpage, NULL); | ||
| 91 | 90 | ||
| 92 | if (!IS_ERR(page)) { | 91 | if (!IS_ERR(page)) { |
| 93 | wait_on_page_locked(page); | 92 | wait_on_page_locked(page); |