3 files changed, 10 insertions, 6 deletions

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 7caa3801ce72..b9cbd7189d74 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -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? */
-                nfsd4_mark_cb_down(clp, task->tk_status);
+                switch (task->tk_status) {
+                case -EIO:
+                case -ETIMEDOUT:
+                        nfsd4_mark_cb_down(clp, task->tk_status);
+                }
                 break;
         default:
                 BUG();
diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 44517fb5c0de..a79e24b79095 100644
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c
@@ -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;
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 8078314981f5..dfe4b596c2e5 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -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;
         }
 }