aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/vfs.c
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2014-10-30 12:37:34 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-10-31 17:48:54 -0400
commitac7576f4b1da8c9c6bc1ae026c2b9e86ae617ba5 (patch)
treed1bc42645ba37d31ce4cd2208f8e4ab14d47467c /fs/nfsd/vfs.c
parent9f2f7d4c8dfcf4617af5de6ea381b91deac3db48 (diff)
vfs: make first argument of dir_context.actor typed
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r--fs/nfsd/vfs.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 989129e2d6ea..161d2d51b6f2 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1819,10 +1819,12 @@ struct readdir_data {
1819 int full; 1819 int full;
1820}; 1820};
1821 1821
1822static int nfsd_buffered_filldir(void *__buf, const char *name, int namlen, 1822static int nfsd_buffered_filldir(struct dir_context *ctx, const char *name,
1823 loff_t offset, u64 ino, unsigned int d_type) 1823 int namlen, loff_t offset, u64 ino,
1824 unsigned int d_type)
1824{ 1825{
1825 struct readdir_data *buf = __buf; 1826 struct readdir_data *buf =
1827 container_of(ctx, struct readdir_data, ctx);
1826 struct buffered_dirent *de = (void *)(buf->dirent + buf->used); 1828 struct buffered_dirent *de = (void *)(buf->dirent + buf->used);
1827 unsigned int reclen; 1829 unsigned int reclen;
1828 1830
@@ -1842,7 +1844,7 @@ static int nfsd_buffered_filldir(void *__buf, const char *name, int namlen,
1842 return 0; 1844 return 0;
1843} 1845}
1844 1846
1845static __be32 nfsd_buffered_readdir(struct file *file, filldir_t func, 1847static __be32 nfsd_buffered_readdir(struct file *file, nfsd_filldir_t func,
1846 struct readdir_cd *cdp, loff_t *offsetp) 1848 struct readdir_cd *cdp, loff_t *offsetp)
1847{ 1849{
1848 struct buffered_dirent *de; 1850 struct buffered_dirent *de;
@@ -1926,7 +1928,7 @@ static __be32 nfsd_buffered_readdir(struct file *file, filldir_t func,
1926 */ 1928 */
1927__be32 1929__be32
1928nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp, 1930nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp,
1929 struct readdir_cd *cdp, filldir_t func) 1931 struct readdir_cd *cdp, nfsd_filldir_t func)
1930{ 1932{
1931 __be32 err; 1933 __be32 err;
1932 struct file *file; 1934 struct file *file;