Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5785368d authored by Sami Tolvanen's avatar Sami Tolvanen
Browse files

ANDROID: fs: nfs: fix filler function type 



Bug: 67506682
Change-Id: I04d4b1b9ab0720a4f342d6617dd132de8654b94c
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent f8a66951

fs/nfs/dir.c

+3 −2
Original line number Diff line number Diff line
@@ -671,8 +671,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

 */

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);

	int ret;
@@ -705,7 +706,7 @@ static 
struct page *get_cache_page(nfs_readdir_descriptor_t *desc)

{

	return read_cache_page(desc->file->f_mapping,

			desc->page_index, (filler_t *)nfs_readdir_filler, desc);

			desc->page_index, nfs_readdir_filler, desc);

}



/*

fs/nfs/read.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ struct nfs_readdesc { 
};



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_page *new;

fs/nfs/symlink.c

+3 −2
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ 
 * 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;



	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)

			return err;

		page = read_cache_page(&inode->i_data, 0,

					(filler_t *)nfs_symlink_filler, inode);

					nfs_symlink_filler, inode);

		if (IS_ERR(page))

			return ERR_CAST(page);

	}