diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 16:35:44 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 16:35:44 +0100 |
| commit | 62ed948cb1405fe95d61d8c6445c102e0c9da0a6 (patch) | |
| tree | f139adcc861a05e7cc09cdb387a271a652fc2d07 /fs/sysv/dir.c | |
| parent | 17ffc7ba6d7ea68b8d5f55a5ca1b87163e69720d (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
| download | kernel-crypto-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.tar.gz kernel-crypto-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.tar.xz kernel-crypto-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/sysv/dir.c')
| -rw-r--r-- | fs/sysv/dir.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c index d7074341ee8..f2bef962d30 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); |