diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-03 15:58:56 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-03 15:58:56 -0500 |
commit | 9c4c761a629caa5572c1a29a8288416070d5d6b7 (patch) | |
tree | ff73a4a5d09de69e18610ad2e2f7dc2c9ce4f6d8 | |
parent | 3a28becc35e5c8f1fabb707bcd8a473712653de6 (diff) |
NFSv4.1: Handle NFSv4.1 session errors in the lock recovery code
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r-- | fs/nfs/nfs4state.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 2ef4fecf3984..3004089e97b1 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c | |||
@@ -877,6 +877,10 @@ static int nfs4_reclaim_locks(struct nfs4_state *state, const struct nfs4_state_ | |||
877 | case -NFS4ERR_EXPIRED: | 877 | case -NFS4ERR_EXPIRED: |
878 | case -NFS4ERR_NO_GRACE: | 878 | case -NFS4ERR_NO_GRACE: |
879 | case -NFS4ERR_STALE_CLIENTID: | 879 | case -NFS4ERR_STALE_CLIENTID: |
880 | case -NFS4ERR_BADSESSION: | ||
881 | case -NFS4ERR_BADSLOT: | ||
882 | case -NFS4ERR_BAD_HIGH_SLOT: | ||
883 | case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: | ||
880 | goto out; | 884 | goto out; |
881 | default: | 885 | default: |
882 | printk(KERN_ERR "%s: unhandled error %d. Zeroing state\n", | 886 | printk(KERN_ERR "%s: unhandled error %d. Zeroing state\n", |
@@ -959,6 +963,10 @@ restart: | |||
959 | case -NFS4ERR_NO_GRACE: | 963 | case -NFS4ERR_NO_GRACE: |
960 | nfs4_state_mark_reclaim_nograce(sp->so_client, state); | 964 | nfs4_state_mark_reclaim_nograce(sp->so_client, state); |
961 | case -NFS4ERR_STALE_CLIENTID: | 965 | case -NFS4ERR_STALE_CLIENTID: |
966 | case -NFS4ERR_BADSESSION: | ||
967 | case -NFS4ERR_BADSLOT: | ||
968 | case -NFS4ERR_BAD_HIGH_SLOT: | ||
969 | case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: | ||
962 | goto out_err; | 970 | goto out_err; |
963 | } | 971 | } |
964 | nfs4_put_open_state(state); | 972 | nfs4_put_open_state(state); |