From mboxrd@z Thu Jan 1 00:00:00 1970 From: "J. Bruce Fields" Subject: Re: [patch 1/9] lockd: dont return EAGAIN from blocking lock request Date: Fri, 9 May 2008 14:11:06 -0400 Message-ID: <20080509181106.GF1907@fieldses.org> References: <20080509124107.645600519@szeredi.hu> <20080509124127.179314495@szeredi.hu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: akpm@linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Trond Myklebust To: Miklos Szeredi Return-path: Content-Disposition: inline In-Reply-To: <20080509124127.179314495@szeredi.hu> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org On Fri, May 09, 2008 at 02:41:08PM +0200, Miklos Szeredi wrote: > From: Miklos Szeredi > > EAGAIN does not make sense as a return value from a blocking lock But nlm_stat_to_errno() is called in the non-blocking case too, right? What am I missing? --b. > request, the lock should be retried by the kernel until either it is > successful or fails permanently. > > Looking at the server side NLM_LCK_DENIED means a permanent error in > this case, so just turn this into an ENOLCK. > > Signed-off-by: Miklos Szeredi > CC: Trond Myklebust > CC: "J. Bruce Fields" > --- > fs/lockd/clntproc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Index: linux-2.6/fs/lockd/clntproc.c > =================================================================== > --- linux-2.6.orig/fs/lockd/clntproc.c 2008-05-09 14:04:16.000000000 +0200 > +++ linux-2.6/fs/lockd/clntproc.c 2008-05-09 14:04:46.000000000 +0200 > @@ -808,7 +808,7 @@ nlm_stat_to_errno(__be32 status) > case NLM_LCK_GRANTED: > return 0; > case NLM_LCK_DENIED: > - return -EAGAIN; > + return -ENOLCK; > case NLM_LCK_DENIED_NOLOCKS: > case NLM_LCK_DENIED_GRACE_PERIOD: > return -ENOLCK; > > --