nfsd4: treat more recall errors as failures
If a recall fails for some unexpected reason, instead of ignoring it and treating it like a success, it's safer to treat it as a failure, preventing further delgation grants and returning CB_PATH_DOWN. Also put put switches in a (two me) more logical order, with normal case first. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Родитель
378b7d37f9
Коммит
172c85dd57
|
@ -667,7 +667,14 @@ static void nfsd4_cb_recall_done(struct rpc_task *task, void *calldata)
|
|||
}
|
||||
|
||||
switch (task->tk_status) {
|
||||
case -EIO:
|
||||
case 0:
|
||||
return;
|
||||
case -EBADHANDLE:
|
||||
case -NFS4ERR_BAD_STATEID:
|
||||
/* Race: client probably got cb_recall
|
||||
* before open reply granting delegation */
|
||||
break;
|
||||
default:
|
||||
/* Network partition? */
|
||||
atomic_set(&clp->cl_cb_set, 0);
|
||||
warn_no_callback_path(clp, task->tk_status);
|
||||
|
@ -676,14 +683,6 @@ static void nfsd4_cb_recall_done(struct rpc_task *task, void *calldata)
|
|||
nfsd4_cb_recall(dp);
|
||||
return;
|
||||
}
|
||||
case -EBADHANDLE:
|
||||
case -NFS4ERR_BAD_STATEID:
|
||||
/* Race: client probably got cb_recall
|
||||
* before open reply granting delegation */
|
||||
break;
|
||||
default:
|
||||
/* success, or error we can't handle */
|
||||
return;
|
||||
}
|
||||
if (dp->dl_retries--) {
|
||||
rpc_delay(task, 2*HZ);
|
||||
|
|
Загрузка…
Ссылка в новой задаче