|
@@ -281,6 +281,7 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode,
|
|
|
}
|
|
|
case -NFS4ERR_GRACE:
|
|
|
case -NFS4ERR_DELAY:
|
|
|
+ case -EKEYEXPIRED:
|
|
|
ret = nfs4_delay(server->client, &exception->timeout);
|
|
|
if (ret != 0)
|
|
|
break;
|
|
@@ -1163,7 +1164,7 @@ static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state
|
|
|
int err;
|
|
|
do {
|
|
|
err = _nfs4_do_open_reclaim(ctx, state);
|
|
|
- if (err != -NFS4ERR_DELAY)
|
|
|
+ if (err != -NFS4ERR_DELAY && err != -EKEYEXPIRED)
|
|
|
break;
|
|
|
nfs4_handle_exception(server, err, &exception);
|
|
|
} while (exception.retry);
|
|
@@ -1582,6 +1583,7 @@ static int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state
|
|
|
goto out;
|
|
|
case -NFS4ERR_GRACE:
|
|
|
case -NFS4ERR_DELAY:
|
|
|
+ case -EKEYEXPIRED:
|
|
|
nfs4_handle_exception(server, err, &exception);
|
|
|
err = 0;
|
|
|
}
|
|
@@ -3452,6 +3454,7 @@ _nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
|
|
|
if (server)
|
|
|
nfs_inc_server_stats(server, NFSIOS_DELAY);
|
|
|
case -NFS4ERR_GRACE:
|
|
|
+ case -EKEYEXPIRED:
|
|
|
rpc_delay(task, NFS4_POLL_RETRY_MAX);
|
|
|
task->tk_status = 0;
|
|
|
return -EAGAIN;
|
|
@@ -3564,6 +3567,7 @@ int nfs4_proc_setclientid_confirm(struct nfs_client *clp, struct rpc_cred *cred)
|
|
|
case -NFS4ERR_RESOURCE:
|
|
|
/* The IBM lawyers misread another document! */
|
|
|
case -NFS4ERR_DELAY:
|
|
|
+ case -EKEYEXPIRED:
|
|
|
err = nfs4_delay(clp->cl_rpcclient, &timeout);
|
|
|
}
|
|
|
} while (err == 0);
|
|
@@ -4179,7 +4183,7 @@ static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request
|
|
|
if (test_bit(NFS_DELEGATED_STATE, &state->flags) != 0)
|
|
|
return 0;
|
|
|
err = _nfs4_do_setlk(state, F_SETLK, request, NFS_LOCK_RECLAIM);
|
|
|
- if (err != -NFS4ERR_DELAY)
|
|
|
+ if (err != -NFS4ERR_DELAY && err != -EKEYEXPIRED)
|
|
|
break;
|
|
|
nfs4_handle_exception(server, err, &exception);
|
|
|
} while (exception.retry);
|
|
@@ -4204,6 +4208,7 @@ static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request
|
|
|
goto out;
|
|
|
case -NFS4ERR_GRACE:
|
|
|
case -NFS4ERR_DELAY:
|
|
|
+ case -EKEYEXPIRED:
|
|
|
nfs4_handle_exception(server, err, &exception);
|
|
|
err = 0;
|
|
|
}
|
|
@@ -4355,6 +4360,7 @@ int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl)
|
|
|
err = 0;
|
|
|
goto out;
|
|
|
case -NFS4ERR_DELAY:
|
|
|
+ case -EKEYEXPIRED:
|
|
|
break;
|
|
|
}
|
|
|
err = nfs4_handle_exception(server, err, &exception);
|
|
@@ -4554,6 +4560,7 @@ static void nfs4_get_lease_time_done(struct rpc_task *task, void *calldata)
|
|
|
switch (task->tk_status) {
|
|
|
case -NFS4ERR_DELAY:
|
|
|
case -NFS4ERR_GRACE:
|
|
|
+ case -EKEYEXPIRED:
|
|
|
dprintk("%s Retry: tk_status %d\n", __func__, task->tk_status);
|
|
|
rpc_delay(task, NFS4_POLL_RETRY_MIN);
|
|
|
task->tk_status = 0;
|