git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfs: pass the correct prototype to read_cache_page
[sfrench/cifs-2.6.git]
/
fs
/
nfs
/
dir.c
diff --git
a/fs/nfs/dir.c
b/fs/nfs/dir.c
index a71d0b42d16053f65a76a885b5fe1c38b819df1c..47d445bec8c919139cc070cf9427b033e5b25b94 100644
(file)
--- a/
fs/nfs/dir.c
+++ b/
fs/nfs/dir.c
@@
-714,8
+714,9
@@
out:
* We only need to convert from xdr once so future lookups are much simpler
*/
static
* 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(
void *data
, struct page* page)
{
{
+ nfs_readdir_descriptor_t *desc = data;
struct inode *inode = file_inode(desc->file);
int ret;
struct inode *inode = file_inode(desc->file);
int ret;
@@
-762,8
+763,8
@@
void cache_page_release(nfs_readdir_descriptor_t *desc)
static
struct page *get_cache_page(nfs_readdir_descriptor_t *desc)
{
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);
+ return read_cache_page(desc->file->f_mapping,
desc->page_index,
+ nfs_readdir_filler, desc);
}
/*
}
/*