Commit 399f11c3 authored Oct 30, 2012 by Bryan Schumaker Committed by Trond Myklebust Oct 31, 2012

NFS: Wait for session recovery to finish before returning



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>
Cc: stable@vger.kernel.org

parent 08f05c49

fs/nfs/nfs4proc.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -339,8 +339,7 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc
		dprintk("%s ERROR: %d Reset session\n", __func__,
		errorcode);
		nfs4_schedule_session_recovery(clp->cl_session, errorcode);
		exception->retry = 1;
		break;
		goto wait_on_recovery;
		#endif /* defined(CONFIG_NFS_V4_1) */
		case -NFS4ERR_FILE_OPEN:
		if (exception->timeout > HZ) {

Admin message