Re: [NLM] 2.6.27 broken

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

On Thu, Feb 05, 2009 at 11:21:53AM +0100, Frank van Maarseveen wrote:
> On Wed, Feb 04, 2009 at 06:33:48PM -0500, J. Bruce Fields wrote:
> > diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
> > index 6063a8e..763b78a 100644
> > --- a/fs/lockd/svclock.c
> > +++ b/fs/lockd/svclock.c
> > @@ -427,7 +427,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
> >  			goto out;
> >  		case -EAGAIN:
> >  			ret = nlm_lck_denied;
> > -			goto out;
> > +			break;
> >  		case FILE_LOCK_DEFERRED:
> >  			if (wait)
> >  				break;
> > @@ -443,6 +443,10 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
> >  			goto out;
> >  	}
> >  
> > +	ret = nlm_lck_denied;
> > +	if (!wait)
> > +		goto out;
> > +
> >  	ret = nlm_lck_blocked;
> >  
> >  	/* Append to list of blocked */
> 
> 
> fix confirmed, thanks!

Good, thanks.--b.