Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[karo-tx-linux.git] / fs / afs / dir.c

diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index adc1cb771b57ef6be60bee4b90c5da577d0faaa4..b42d5cc1d6d21aace96eaae96fe3aa521822c7c9 100644 (file)
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -189,13 +189,9 @@ static struct page *afs_dir_get_page(struct inode *dir, unsigned long index,
                                     struct key *key)
 {
        struct page *page;
-       struct file file = {
-               .private_data = key,
-       };
-
        _enter("{%lu},%lu", dir->i_ino, index);
 
-       page = read_mapping_page(dir->i_mapping, index, &file);
+       page = read_cache_page(dir->i_mapping, index, afs_page_filler, key);
        if (!IS_ERR(page)) {
                kmap(page);
                if (!PageChecked(page))