diff options
Diffstat (limited to 'fs/afs/mntpt.c')
| -rw-r--r-- | fs/afs/mntpt.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c index 7b6dc03caf44..99785a79d043 100644 --- a/fs/afs/mntpt.c +++ b/fs/afs/mntpt.c | |||
| @@ -63,7 +63,6 @@ unsigned long afs_mntpt_expiry_timeout = 20; | |||
| 63 | int afs_mntpt_check_symlink(struct afs_vnode *vnode) | 63 | int afs_mntpt_check_symlink(struct afs_vnode *vnode) |
| 64 | { | 64 | { |
| 65 | struct page *page; | 65 | struct page *page; |
| 66 | filler_t *filler; | ||
| 67 | size_t size; | 66 | size_t size; |
| 68 | char *buf; | 67 | char *buf; |
| 69 | int ret; | 68 | int ret; |
| @@ -71,10 +70,7 @@ int afs_mntpt_check_symlink(struct afs_vnode *vnode) | |||
| 71 | _enter("{%u,%u}", vnode->fid.vnode, vnode->fid.unique); | 70 | _enter("{%u,%u}", vnode->fid.vnode, vnode->fid.unique); |
| 72 | 71 | ||
| 73 | /* read the contents of the symlink into the pagecache */ | 72 | /* read the contents of the symlink into the pagecache */ |
| 74 | filler = (filler_t *) AFS_VNODE_TO_I(vnode)->i_mapping->a_ops->readpage; | 73 | page = read_mapping_page(AFS_VNODE_TO_I(vnode)->i_mapping, 0, NULL); |
| 75 | |||
| 76 | page = read_cache_page(AFS_VNODE_TO_I(vnode)->i_mapping, 0, | ||
| 77 | filler, NULL); | ||
| 78 | if (IS_ERR(page)) { | 74 | if (IS_ERR(page)) { |
| 79 | ret = PTR_ERR(page); | 75 | ret = PTR_ERR(page); |
| 80 | goto out; | 76 | goto out; |
| @@ -160,7 +156,6 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt) | |||
| 160 | struct page *page = NULL; | 156 | struct page *page = NULL; |
| 161 | size_t size; | 157 | size_t size; |
| 162 | char *buf, *devname = NULL, *options = NULL; | 158 | char *buf, *devname = NULL, *options = NULL; |
| 163 | filler_t *filler; | ||
| 164 | int ret; | 159 | int ret; |
| 165 | 160 | ||
| 166 | kenter("{%s}", mntpt->d_name.name); | 161 | kenter("{%s}", mntpt->d_name.name); |
| @@ -182,9 +177,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt) | |||
| 182 | goto error; | 177 | goto error; |
| 183 | 178 | ||
| 184 | /* read the contents of the AFS special symlink */ | 179 | /* read the contents of the AFS special symlink */ |
| 185 | filler = (filler_t *)mntpt->d_inode->i_mapping->a_ops->readpage; | 180 | page = read_mapping_page(mntpt->d_inode->i_mapping, 0, NULL); |
| 186 | |||
| 187 | page = read_cache_page(mntpt->d_inode->i_mapping, 0, filler, NULL); | ||
| 188 | if (IS_ERR(page)) { | 181 | if (IS_ERR(page)) { |
| 189 | ret = PTR_ERR(page); | 182 | ret = PTR_ERR(page); |
| 190 | goto error; | 183 | goto error; |
