Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c73b9d2 authored by Scott Mayhew's avatar Scott Mayhew Committed by J. Bruce Fields
Browse files

nfsd: update callback done processing 



Instead of having the convention where individual nfsd4_callback_ops->done
operations return -1 to indicate the callback path is down, move the check
to nfsd4_cb_done.  Only mark the callback path down on transport-level
errors, not NFS-level errors.

The existing logic causes the server to set SEQ4_STATUS_CB_PATH_DOWN
just because the client returned an error to a CB_RECALL for a
delegation that the client had already done a FREE_STATEID for.  But
clearly that error doesn't mean that there's anything wrong with the
backchannel.

Additionally, handle NFS4ERR_DELAY in nfsd4_cb_recall_done.  The client
returns NFS4ERR_DELAY if it is already in the process of returning the
delegation.

Signed-off-by: default avatarScott Mayhew <smayhew@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 5926459e

fs/nfsd/nfs4callback.c

+5 −4
Original line number Diff line number Diff line
@@ -1122,10 +1122,11 @@ static void nfsd4_cb_done(struct rpc_task *task, void *calldata) 
		rpc_restart_call_prepare(task);

		return;

	case 1:

		break;

	case -1:

		/* Network partition? */

		switch (task->tk_status) {

		case -EIO:

		case -ETIMEDOUT:

			nfsd4_mark_cb_down(clp, task->tk_status);

		}

		break;

	default:

		BUG();

fs/nfsd/nfs4layouts.c

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ nfsd4_cb_layout_done(struct nfsd4_callback *cb, struct rpc_task *task) 
			ops->fence_client(ls);

		else

			nfsd4_cb_layout_fail(ls);

		return -1;

		return 1;

	case -NFS4ERR_NOMATCHING_LAYOUT:

		trace_nfsd_layout_recall_done(&ls->ls_stid.sc_stateid);

		task->tk_status = 0;

fs/nfsd/nfs4state.c

+4 −1
Original line number Diff line number Diff line
@@ -3970,6 +3970,9 @@ static int nfsd4_cb_recall_done(struct nfsd4_callback *cb, 
	switch (task->tk_status) {

	case 0:

		return 1;

	case -NFS4ERR_DELAY:

		rpc_delay(task, 2 * HZ);

		return 0;

	case -EBADHANDLE:

	case -NFS4ERR_BAD_STATEID:

		/*
@@ -3982,7 +3985,7 @@ static int nfsd4_cb_recall_done(struct nfsd4_callback *cb, 
		}

		/*FALLTHRU*/

	default:

		return -1;

		return 1;

	}

}