From 0b9eb98bd2f08ae30107e091ef7e036af5f906a6 Mon Sep 17 00:00:00 2001
From: Ricardo Labiaga <Ricardo.Labiaga@netapp.com>
Date: Mon, 7 Dec 2009 09:48:30 -0500
Subject: [PATCH] --- yaml --- r: 175991 b: refs/heads/master c:
 74e7bb73a3e0d15a7db10b0f2b2efdeeef36609e h: refs/heads/master i:   175989:
 3cf82c8459735d9c9a6770d7edcbbe048e9aedc0   175987:
 9ae0f3bfe7fe825369c8adc28b207f1d8594fdc3   175983:
 834c4cd79246b6015e66a69e2496346a2cc2ce6f v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfs/nfs4proc.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 29fcb4587341..49b74392f618 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79708861189eb89dea6711bd0464b097b69e7c79
+refs/heads/master: 74e7bb73a3e0d15a7db10b0f2b2efdeeef36609e
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index d8c2ceb303d1..cdf17d628450 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -4180,6 +4180,11 @@ int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl)
 			case -NFS4ERR_EXPIRED:
 			case -NFS4ERR_STALE_CLIENTID:
 			case -NFS4ERR_STALE_STATEID:
+			case -NFS4ERR_BADSESSION:
+			case -NFS4ERR_BADSLOT:
+			case -NFS4ERR_BAD_HIGH_SLOT:
+			case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:
+			case -NFS4ERR_DEADSESSION:
 				nfs4_schedule_state_recovery(server->nfs_client);
 				goto out;
 			case -ERESTARTSYS: