On Mon, Sep 22, 2014 at 11:29:23AM -0700, Christoph Hellwig wrote:
> The error handling for CB_RECALL seems fairly broken to me.
>
> What looks good:
>
> - for EBADHANDLE and NFS4ERR_BAD_STATEID retry until dl_retries
> hits zero, then mark the connection down and set cb_done
>
> What looks wrong:
>
> - for everything else we first mark the connection down, then
> retry until dl_retries hits zero, then mark the connection down
> again and set cb_done.
>
> >From all I can see what we want is:
>
> - keep the behavior for EBADHANDLE and NFS4ERR_BAD_STATEID,
> otherwise jump straight to making the connection down
> and setting cb_done
>
> But maybe I'm missing something?
I can't think of anything; let me know when you want something applied.
--b.
>
>
> diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
> index 17d5441..ed25c58 100644
> --- a/fs/nfsd/nfs4callback.c
> +++ b/fs/nfsd/nfs4callback.c
> @@ -971,24 +971,21 @@ static void nfsd4_cb_recall_done(struct rpc_task *task, void *calldata)
> return;
> switch (task->tk_status) {
> case 0:
> - cb->cb_done = true;
> - return;
> + break;
> case -EBADHANDLE:
> case -NFS4ERR_BAD_STATEID:
> /* Race: client probably got cb_recall
> * before open reply granting delegation */
> - break;
> + if (dp->dl_retries--) {
> + rpc_delay(task, 2*HZ);
> + task->tk_status = 0;
> + rpc_restart_call_prepare(task);
> + return;
> + }
> default:
> /* Network partition? */
> nfsd4_mark_cb_down(clp, task->tk_status);
> }
> - if (dp->dl_retries--) {
> - rpc_delay(task, 2*HZ);
> - task->tk_status = 0;
> - rpc_restart_call_prepare(task);
> - return;
> - }
> - nfsd4_mark_cb_down(clp, task->tk_status);
> cb->cb_done = true;
> }
>
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
