Re: kernel BUG at fs/locks.c:1932!

[Trond Myklebust <trond.myklebust@fys.uio.no>]

[-- Attachment #1: Type: text/plain, Size: 764 bytes --]

On Fri, 2006-02-17 at 16:15 +0100, Fermin Molina wrote:
> Hi,
> 
> I run samba sharing NFS mounted shares from another machine. I'm getting
> the following bugs in console (and in logs), when I stop samba (but not
> always, I think it depends of stalled locks):
> 
> lockd: unexpected unlock status: 7
> lockd: unexpected unlock status: 7
> lockd: unexpected unlock status: 7
> ------------[ cut here ]------------

Hmm... The problem here is that the server is returning an unexpected
error: it is normally supposed to return "lock granted" or "grace
error", but is actually returning "stale filehandle".

Anyhow, the client should be able to deal with this without Oopsing.

The attached patch ought to fix that. Please could you give it a try?

Cheers,
  Trond

[-- Attachment #2: linux-2.6.16-68-fix_unlock_bad_res.dif --]
[-- Type: text/plain, Size: 1078 bytes --]

Author: Trond Myklebust <Trond.Myklebust@netapp.com>
NLM: Ensure we do not Oops in the case of an unlock

In theory, NLM specs assure us that the server will only reply LCK_GRANTED
or LCK_DENIED_GRACE_PERIOD to our NLM_UNLOCK request.

In practice, we should not assume this to be the case, and the code will
currently Oops if we do.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

 fs/lockd/clntproc.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index 7e89655..da76592 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -644,10 +644,16 @@ nlmclnt_unlock(struct nlm_rqst *req, str
 
 	status = nlmclnt_call(req, NLMPROC_UNLOCK);
 	nlmclnt_release_lockargs(req);
+	/*
+	 * Note: the server is supposed to either grant us the unlock
+	 * request, or to deny it with NLM_LCK_DENIED_GRACE_PERIOD. In either
+	 * case, we want to unlock.
+	 */
+	do_vfs_lock(fl);
+
 	if (status < 0)
 		return status;
 
-	do_vfs_lock(fl);
 	if (resp->status == NLM_LCK_GRANTED)
 		return 0;