diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /fs/freevxfs/vxfs_subr.c | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
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); |