From 02fe4707740e7c8a3d0ec34ffbf4630d7d41ca68 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Thu, 20 Mar 2014 21:32:04 -0400 Subject: nfsd4: nfsd_vfs_read doesn't use file handle parameter Signed-off-by: J. Bruce Fields --- fs/nfsd/vfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 3aa38523b6d7..f3a0f6cc4298 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -821,7 +821,7 @@ static int nfsd_direct_splice_actor(struct pipe_inode_info *pipe, } static __be32 -nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, +nfsd_vfs_read(struct svc_rqst *rqstp, struct file *file, loff_t offset, struct kvec *vec, int vlen, unsigned long *count) { mm_segment_t oldfs; @@ -981,7 +981,7 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp, if (ra && ra->p_set) file->f_ra = ra->p_ra; - err = nfsd_vfs_read(rqstp, fhp, file, offset, vec, vlen, count); + err = nfsd_vfs_read(rqstp, file, offset, vec, vlen, count); /* Write back readahead params */ if (ra) { @@ -1010,7 +1010,7 @@ nfsd_read_file(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, NFSD_MAY_READ|NFSD_MAY_OWNER_OVERRIDE); if (err) goto out; - err = nfsd_vfs_read(rqstp, fhp, file, offset, vec, vlen, count); + err = nfsd_vfs_read(rqstp, file, offset, vec, vlen, count); } else /* Note file may still be NULL in NFSv4 special stateid case: */ err = nfsd_read(rqstp, fhp, offset, vec, vlen, count); out: -- cgit v1.2.3-58-ga151