diff options
| author | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
| commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
| tree | 06a3183a562f8da4688f65023f7a18dcad702956 /fs/ntfs/aops.h | |
| parent | adf8a287150667feb5747f8beade62acacc17d4e (diff) | |
| parent | 1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff) | |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
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); |