From: "J. Bruce Fields" <bfields@fieldses.org>
To: Frank van Maarseveen <frankvm@frankvm.com>
Cc: Miklos Szeredi <mszeredi@suse.cz>,
Linux NFS mailing list <linux-nfs@vger.kernel.org>
Subject: Re: [NLM] 2.6.27 broken
Date: Thu, 5 Feb 2009 14:52:19 -0500 [thread overview]
Message-ID: <20090205195219.GE9200@fieldses.org> (raw)
In-Reply-To: <20090205102153.GA29389@janus>
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.
next prev parent reply other threads:[~2009-02-05 19:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-15 13:28 [NLM] 2.6.27 broken Frank van Maarseveen
2008-11-20 22:27 ` J. Bruce Fields
2008-11-28 11:24 ` Frank van Maarseveen
2008-12-16 17:39 ` J. Bruce Fields
2008-12-16 19:43 ` Miklos Szeredi
2008-12-16 20:16 ` J. Bruce Fields
2009-02-04 23:33 ` J. Bruce Fields
2009-02-05 10:21 ` Frank van Maarseveen
2009-02-05 19:52 ` J. Bruce Fields [this message]
2009-02-05 10:47 ` Miklos Szeredi
2009-02-05 19:52 ` J. Bruce Fields
2009-02-06 11:29 ` Miklos Szeredi
2009-02-09 18:10 ` J. Bruce Fields
2009-02-09 20:18 ` Miklos Szeredi
2009-02-09 20:51 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090205195219.GE9200@fieldses.org \
--to=bfields@fieldses.org \
--cc=frankvm@frankvm.com \
--cc=linux-nfs@vger.kernel.org \
--cc=mszeredi@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox