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/freevxfs/vxfs_subr.c | |
| parent | 189acaaef81b1d71aedd0d28810de24160c2e781 (diff) | |
| parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/freevxfs/vxfs_subr.c')
| -rw-r--r-- | fs/freevxfs/vxfs_subr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/freevxfs/vxfs_subr.c b/fs/freevxfs/vxfs_subr.c index 50aae77651b2..c1be118fc067 100644 --- a/fs/freevxfs/vxfs_subr.c +++ b/fs/freevxfs/vxfs_subr.c | |||
| @@ -71,8 +71,7 @@ vxfs_get_page(struct address_space *mapping, u_long n) | |||
| 71 | { | 71 | { |
| 72 | struct page * pp; | 72 | struct page * pp; |
| 73 | 73 | ||
| 74 | pp = read_cache_page(mapping, n, | 74 | pp = read_mapping_page(mapping, n, NULL); |
| 75 | (filler_t*)mapping->a_ops->readpage, NULL); | ||
| 76 | 75 | ||
| 77 | if (!IS_ERR(pp)) { | 76 | if (!IS_ERR(pp)) { |
| 78 | wait_on_page_locked(pp); | 77 | wait_on_page_locked(pp); |