summaryrefslogtreecommitdiffstats
path: root/fs/sysv/dir.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-06-25 15:57:32 +0000
committerSteve French <sfrench@us.ibm.com>2006-06-25 15:57:32 +0000
commitbbe5d235ee201705530a7153b57e141cd77d818b (patch)
treee98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /fs/sysv/dir.c
parent189acaaef81b1d71aedd0d28810de24160c2e781 (diff)
parentdfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff)
downloadlinux-stable-bbe5d235ee201705530a7153b57e141cd77d818b.tar.gz
linux-stable-bbe5d235ee201705530a7153b57e141cd77d818b.tar.bz2
linux-stable-bbe5d235ee201705530a7153b57e141cd77d818b.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/sysv/dir.c')
-rw-r--r--fs/sysv/dir.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c
index d7074341ee87..f2bef962d309 100644
--- a/fs/sysv/dir.c
+++ b/fs/sysv/dir.c
@@ -53,8 +53,7 @@ static int dir_commit_chunk(struct page *page, unsigned from, unsigned to)
static struct page * dir_get_page(struct inode *dir, unsigned long n)
{
struct address_space *mapping = dir->i_mapping;
- struct page *page = read_cache_page(mapping, n,
- (filler_t*)mapping->a_ops->readpage, NULL);
+ struct page *page = read_mapping_page(mapping, n, NULL);
if (!IS_ERR(page)) {
wait_on_page_locked(page);
kmap(page);