nfsd: fix nfsd4_cb_recall_done error handling

For any error that is not EBADHANDLE or NFS4ERR_BAD_STATEID,
nfsd4_cb_recall_done first marks the connection down, then
retries until dl_retries hits zero, then marks the connection down
again and sets cb_done.  This changes the code to only retry
for EBADHANDLE or NFS4ERR_BAD_STATEID, and factors setting
cb_done into a single point in the function.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

fs/nfsd/nfs4callback.c

@@ -874,24 +874,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;
-	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;
 		}
+	default:
+		/* Network partition? */
 		nfsd4_mark_cb_down(clp, task->tk_status);
+	}
 	cb->cb_done = true;
 }