Re: [PATCH 09/44] nfsd41: sanity check client drc maxreqs

["J. Bruce Fields" <bfields@fieldses.org>]

On Tue, Jun 16, 2009 at 08:35:38PM -0400, bfields wrote:
> On Tue, Jun 16, 2009 at 04:19:38AM +0300, Benny Halevy wrote:
> > From: Andy Adamson <andros@netapp.com>
> > 
> > Ensure the client requested maximum requests are between 1 and
> > NFSD_MAX_SLOTS_PER_SESSION
> > 
> > Signed-off-by: Andy Adamson <andros@netapp.com>
> > Signed-off-by: Benny Halevy <bhalevy@panasas.com>
> > ---
> >  fs/nfsd/nfs4state.c |    5 +++++
> >  1 files changed, 5 insertions(+), 0 deletions(-)
> > 
> > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> > index 582cd2c..90e6645 100644
> > --- a/fs/nfsd/nfs4state.c
> > +++ b/fs/nfsd/nfs4state.c
> > @@ -425,6 +425,11 @@ static int set_forechannel_maxreqs(struct nfsd4_channel_attrs *fchan)
> >  {
> >  	int status = 0, np = fchan->maxreqs * NFSD_PAGES_PER_SLOT;
> >  
> > +	if (fchan->maxreqs < 1)
> > +		return nfserr_inval;
> > +	else if (fchan->maxreqs > NFSD_MAX_SLOTS_PER_SESSION)
> > +		fchan->maxreqs = NFSD_MAX_SLOTS_PER_SESSION;
> > +
> >  	spin_lock(&nfsd_serv->sv_lock);
> 
> How did this use of sv_lock creep in?  Let's remove that before we do
> anything else....

(But--applied.)

--b.

> 
> --b.
> 
> >  	if (np + nfsd_serv->sv_drc_pages_used > nfsd_serv->sv_drc_max_pages)
> >  		np = nfsd_serv->sv_drc_max_pages - nfsd_serv->sv_drc_pages_used;
> > -- 
> > 1.6.3
> >