NFS: Wait for session recovery to finish before returning
authorBryan Schumaker <bjschuma@netapp.com>
Tue, 30 Oct 2012 20:06:35 +0000 (16:06 -0400)
committerBen Hutchings <ben@decadent.org.uk>
Fri, 16 Nov 2012 16:47:03 +0000 (16:47 +0000)
commit0182399b8032adcc5123ac9ab4634c1f060cb7fd
tree43a659ab7bc9517492873fecadc69dd8a9ae303d
parentc2ba72569bfde13675ef00ed3f44f500f0d7c10a
NFS: Wait for session recovery to finish before returning

commit 399f11c3d872bd748e1575574de265a6304c7c43 upstream.

Currently, we will schedule session recovery and then return to the
caller of nfs4_handle_exception.  This works for most cases, but causes
a hang on the following test case:

Client Server
------ ------
Open file over NFS v4.1
Write to file
Expire client
Try to lock file

The server will return NFS4ERR_BADSESSION, prompting the client to
schedule recovery.  However, the client will continue placing lock
attempts and the open recovery never seems to be scheduled.  The
simplest solution is to wait for session recovery to run before retrying
the lock.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
fs/nfs/nfs4proc.c