On Fri, 7 Aug 2015 23:29:52 +0800
Kinglong Mee <kinglongmee@xxxxxxxxx> wrote:
>
> On 8/6/2015 05:13, Jeff Layton wrote:
> > Signed-off-by: Jeff Layton <jeff.layton@xxxxxxxxxxxxxxx>
> > ---
> > fs/nfsd/vfs.c | 20 +++++++-------------
> > 1 file changed, 7 insertions(+), 13 deletions(-)
> >
> > diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> > index 59234d1d8d8e..fd688c86af66 100644
> > --- a/fs/nfsd/vfs.c
> > +++ b/fs/nfsd/vfs.c
> > @@ -980,20 +980,14 @@ out_nfserr:
> > __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
> > loff_t offset, struct kvec *vec, int vlen, unsigned long *count)
> > {
> > - struct file *file;
> > - struct raparms *ra;
> > - __be32 err;
> > -
> > - err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file);
> > - if (err)
> > - return err;
> > -
> > - ra = nfsd_init_raparms(file);
> > - err = nfsd_vfs_read(rqstp, file, offset, vec, vlen, count);
> > - if (ra)
> > - nfsd_put_raparams(file, ra);
>
> Drop the raparms here ?
>
>
I'm not sure I understand your question. Are you asking why I dropped
the raparms from this code?
If so, the reason is that we shouldn't need it any longer. We only keep
that cache now because we do an open for every READ RPC. With this, a
streaming read should end up using the same struct file, at least as
long as there's not _too_ long a delay between READ RPCs. The normal
vfs readahead machinery should work properly with this change.
I'd like to eventually have us hook this up to the nfs4_file cache as
well. I stopped short of that here since I didn't need that immediately
for what I'm working on, but it should be possible to make the
nfs4_file cache use the nfsd_file cache instead of calling dentry_open
directly. Once we do that, then I don't think we'll need the raparms
cache at all anymore.
> > - fput(file);
> > + __be32 err;
> > + struct nfsd_file *nf;
> >
> > + err = nfsd_file_acquire(rqstp, fhp, NFSD_MAY_READ, &nf);
> > + if (err == nfs_ok)
> > + err = nfsd_vfs_read(rqstp, nf->nf_file, offset, vec, vlen,
> > + count);
> > + nfsd_file_put(nf);
> > return err;
> > }
> >
> >
--
Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
