mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
[PATCH] read_mapping_page for address space
Add read_mapping_page() which is used for callers that pass mapping->a_ops->readpage as the filler for read_cache_page. This removes some duplication from filesystem code. Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
c330dda908
commit
090d2b185d
22 changed files with 38 additions and 56 deletions
|
|
@ -185,9 +185,7 @@ static struct page *afs_dir_get_page(struct inode *dir, unsigned long index)
|
|||
|
||||
_enter("{%lu},%lu", dir->i_ino, index);
|
||||
|
||||
page = read_cache_page(dir->i_mapping,index,
|
||||
(filler_t *) dir->i_mapping->a_ops->readpage,
|
||||
NULL);
|
||||
page = read_mapping_page(dir->i_mapping, index, NULL);
|
||||
if (!IS_ERR(page)) {
|
||||
wait_on_page_locked(page);
|
||||
kmap(page);
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ unsigned long afs_mntpt_expiry_timeout = 20;
|
|||
int afs_mntpt_check_symlink(struct afs_vnode *vnode)
|
||||
{
|
||||
struct page *page;
|
||||
filler_t *filler;
|
||||
size_t size;
|
||||
char *buf;
|
||||
int ret;
|
||||
|
|
@ -71,10 +70,7 @@ int afs_mntpt_check_symlink(struct afs_vnode *vnode)
|
|||
_enter("{%u,%u}", vnode->fid.vnode, vnode->fid.unique);
|
||||
|
||||
/* read the contents of the symlink into the pagecache */
|
||||
filler = (filler_t *) AFS_VNODE_TO_I(vnode)->i_mapping->a_ops->readpage;
|
||||
|
||||
page = read_cache_page(AFS_VNODE_TO_I(vnode)->i_mapping, 0,
|
||||
filler, NULL);
|
||||
page = read_mapping_page(AFS_VNODE_TO_I(vnode)->i_mapping, 0, NULL);
|
||||
if (IS_ERR(page)) {
|
||||
ret = PTR_ERR(page);
|
||||
goto out;
|
||||
|
|
@ -160,7 +156,6 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)
|
|||
struct page *page = NULL;
|
||||
size_t size;
|
||||
char *buf, *devname = NULL, *options = NULL;
|
||||
filler_t *filler;
|
||||
int ret;
|
||||
|
||||
kenter("{%s}", mntpt->d_name.name);
|
||||
|
|
@ -182,9 +177,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)
|
|||
goto error;
|
||||
|
||||
/* read the contents of the AFS special symlink */
|
||||
filler = (filler_t *)mntpt->d_inode->i_mapping->a_ops->readpage;
|
||||
|
||||
page = read_cache_page(mntpt->d_inode->i_mapping, 0, filler, NULL);
|
||||
page = read_mapping_page(mntpt->d_inode->i_mapping, 0, NULL);
|
||||
if (IS_ERR(page)) {
|
||||
ret = PTR_ERR(page);
|
||||
goto error;
|
||||
|
|
|
|||
Loading…
Reference in a new issue