From 510bdd3ade342ca0e559c01f64a23e526dfdafac Mon Sep 17 00:00:00 2001
From: Benny Halevy <bhalevy@panasas.com>
Date: Wed, 19 Oct 2011 19:12:58 -0700
Subject: [PATCH] --- yaml --- r: 267199 b: refs/heads/master c:
 5423732a71577f7860c56a4eea2c34ff162ddd73 h: refs/heads/master i:   267197:
 81d60573be491f81dc87a472af2e6523b0ed694b   267195:
 bec82827b51ba3da31578df6ad7bfa319e4f0130   267191:
 b5a2d06b0444e7b8924cd8d4595cff6c8969783a   267183:
 bc6e77cf146f86b6cac3398776ecf89714476eff   267167:
 184ac332802f460fea051143c8624b04069b5178   267135:
 98ad9b908d4d636fc90297e5842aa3256cd78c65 v: v3

---
 [refs]                       |  2 +-
 trunk/fs/nfsd/nfs4callback.c | 10 ++++++++++
 trunk/fs/nfsd/nfs4state.c    |  8 +++++++-
 trunk/fs/nfsd/state.h        |  1 +
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f1d874da9013..ce6756abeee7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b289b2c2355c3bea75f3e499b4aa251a3191382
+refs/heads/master: 5423732a71577f7860c56a4eea2c34ff162ddd73
diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c
index de018ecadae6..7748d6a18d97 100644
--- a/trunk/fs/nfsd/nfs4callback.c
+++ b/trunk/fs/nfsd/nfs4callback.c
@@ -39,6 +39,8 @@
 
 #define NFSDDBG_FACILITY                NFSDDBG_PROC
 
+static void nfsd4_mark_cb_fault(struct nfs4_client *, int reason);
+
 #define NFSPROC4_CB_NULL 0
 #define NFSPROC4_CB_COMPOUND 1
 
@@ -460,6 +462,8 @@ static int decode_cb_sequence4resok(struct xdr_stream *xdr,
 	 */
 	status = 0;
 out:
+	if (status)
+		nfsd4_mark_cb_fault(cb->cb_clp, status);
 	return status;
 out_overflow:
 	print_overflow_msg(__func__, xdr);
@@ -686,6 +690,12 @@ static void nfsd4_mark_cb_down(struct nfs4_client *clp, int reason)
 	warn_no_callback_path(clp, reason);
 }
 
+static void nfsd4_mark_cb_fault(struct nfs4_client *clp, int reason)
+{
+	clp->cl_cb_state = NFSD4_CB_FAULT;
+	warn_no_callback_path(clp, reason);
+}
+
 static void nfsd4_cb_probe_done(struct rpc_task *task, void *calldata)
 {
 	struct nfs4_client *clp = container_of(calldata, struct nfs4_client, cl_cb_null);
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index e8c2a3ec0e60..b51ad43b7ea1 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -1945,8 +1945,14 @@ nfsd4_sequence(struct svc_rqst *rqstp,
 
 		nfsd4_get_session(cstate->session);
 		atomic_inc(&clp->cl_refcount);
-		if (clp->cl_cb_state == NFSD4_CB_DOWN)
+		switch (clp->cl_cb_state) {
+		case NFSD4_CB_DOWN:
 			seq->status_flags |= SEQ4_STATUS_CB_PATH_DOWN;
+			break;
+		case NFSD4_CB_FAULT:
+			seq->status_flags |= SEQ4_STATUS_BACKCHANNEL_FAULT;
+			break;
+		}
 	}
 	kfree(conn);
 	spin_unlock(&client_lock);
diff --git a/trunk/fs/nfsd/state.h b/trunk/fs/nfsd/state.h
index 1a5820066040..a3cf38476a1b 100644
--- a/trunk/fs/nfsd/state.h
+++ b/trunk/fs/nfsd/state.h
@@ -258,6 +258,7 @@ struct nfs4_client {
 #define NFSD4_CB_UP		0
 #define NFSD4_CB_UNKNOWN	1
 #define NFSD4_CB_DOWN		2
+#define NFSD4_CB_FAULT		3
 	int			cl_cb_state;
 	struct nfsd4_callback	cl_cb_null;
 	struct nfsd4_session	*cl_cb_session;