Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ANDROID: fs: nfs: fix filler function type

Browse source 
Bug: 67506682
Change-Id: I04d4b1b9ab0720a4f342d6617dd132de8654b94c
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
This commit is contained in:
Sami Tolvanen 2018-02-13 13:01:39 -08:00 committed by Amit Pundir
parent 57a50d911c
commit e7b91c0405
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/nfs/dir.c
View file

@ -664,8 +664,9 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page,
* We only need to convert from xdr once so future lookups are much simpler * We only need to convert from xdr once so future lookups are much simpler
*/ */
static static
int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page* page) int nfs_readdir_filler(struct file *file, struct page* page)
{ {
nfs_readdir_descriptor_t *desc = (nfs_readdir_descriptor_t *)file;
struct inode *inode = file_inode(desc->file); struct inode *inode = file_inode(desc->file);
int ret; int ret;
@ -698,7 +699,7 @@ static
struct page *get_cache_page(nfs_readdir_descriptor_t *desc) struct page *get_cache_page(nfs_readdir_descriptor_t *desc)
{ {
return read_cache_page(desc->file->f_mapping, return read_cache_page(desc->file->f_mapping,
desc->page_index, (filler_t *)nfs_readdir_filler, desc); desc->page_index, nfs_readdir_filler, desc);
} }
/* /*

2
fs/nfs/read.c
View file

@ -354,7 +354,7 @@ struct nfs_readdesc {
}; };
static int static int
readpage_async_filler(void *data, struct page *page) readpage_async_filler(struct file *data, struct page *page)
{ {
struct nfs_readdesc *desc = (struct nfs_readdesc *)data; struct nfs_readdesc *desc = (struct nfs_readdesc *)data;
struct nfs_page *new; struct nfs_page *new;

5
fs/nfs/symlink.c
View file

@ -26,8 +26,9 @@
* and straight-forward than readdir caching. * and straight-forward than readdir caching.
*/ */
static int nfs_symlink_filler(struct inode *inode, struct page *page) static int nfs_symlink_filler(struct file *file, struct page *page)
{ {
struct inode *inode = (struct inode *)file;
int error; int error;
error = NFS_PROTO(inode)->readlink(inode, page, 0, PAGE_SIZE); error = NFS_PROTO(inode)->readlink(inode, page, 0, PAGE_SIZE);
@ -66,7 +67,7 @@ static const char *nfs_get_link(struct dentry *dentry,
if (err) if (err)
return err; return err;
page = read_cache_page(&inode->i_data, 0, page = read_cache_page(&inode->i_data, 0,
(filler_t *)nfs_symlink_filler, inode); nfs_symlink_filler, inode);
if (IS_ERR(page)) if (IS_ERR(page))
return ERR_CAST(page); return ERR_CAST(page);
} }