From 0d6e6111166c5f4cac7084e6f62958497c39efbd Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 4 Oct 2010 17:59:08 -0400 Subject: [PATCH] --- yaml --- r: 217063 b: refs/heads/master c: ae1007d37e00144b72906a4bdc47d517ae91bcc1 h: refs/heads/master i: 217061: 48e4289e33e264502bf8bed10b4357601162021d 217059: 33adcf075aff373c56ff14f3b038ee734ce46c1e 217055: ac60699618160dba7dd53bdc34ae423884ef9150 v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4proc.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 7b72ea9f4db2..03c4a3d32f71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0ed9dbc24f1fd912b2dd08b995153cafc1d5b1c +refs/heads/master: ae1007d37e00144b72906a4bdc47d517ae91bcc1 diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c index 7f25246bf38c..88a9d93ec1bd 100644 --- a/trunk/fs/nfs/nfs4proc.c +++ b/trunk/fs/nfs/nfs4proc.c @@ -255,9 +255,6 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, nfs4_state_mark_reclaim_nograce(clp, state); goto do_state_recovery; case -NFS4ERR_STALE_STATEID: - if (state == NULL) - break; - nfs4_state_mark_reclaim_reboot(clp, state); case -NFS4ERR_STALE_CLIENTID: case -NFS4ERR_EXPIRED: goto do_state_recovery; @@ -3414,9 +3411,6 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, nfs4_state_mark_reclaim_nograce(clp, state); goto do_state_recovery; case -NFS4ERR_STALE_STATEID: - if (state == NULL) - break; - nfs4_state_mark_reclaim_reboot(clp, state); case -NFS4ERR_STALE_CLIENTID: case -NFS4ERR_EXPIRED: goto do_state_recovery;