From 9c960aa409756a1141fe78e832cd45a34b2c6d3d Mon Sep 17 00:00:00 2001
From: Casey Bodley <cbodley@citi.umich.edu>
Date: Wed, 5 Jan 2011 11:54:06 -0500
Subject: [PATCH] rpc: rebind back channel on reconnect

after reestablishing an rpc connection, send BIND_CONN_TO_SESSION if we need a back channel

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
---
 daemon/nfs41.h     |  1 +
 daemon/nfs41_rpc.c | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/daemon/nfs41.h b/daemon/nfs41.h
index ce8e8a8..ae11610 100644
--- a/daemon/nfs41.h
+++ b/daemon/nfs41.h
@@ -115,6 +115,7 @@ typedef struct __nfs41_rpc_clnt {
     uint32_t version;
     bool_t is_valid_session;
     bool_t in_recovery;
+    bool_t needcb;
 } nfs41_rpc_clnt;
 
 struct client_state {
diff --git a/daemon/nfs41_rpc.c b/daemon/nfs41_rpc.c
index 264ba5e..36c528e 100644
--- a/daemon/nfs41_rpc.c
+++ b/daemon/nfs41_rpc.c
@@ -21,7 +21,7 @@
  * such damages.
  */
 
-#include "nfs41.h"
+#include "nfs41_ops.h"
 #include "daemon_debug.h"
 #include "nfs41_xdr.h"
 #include "nfs41_callback.h"
@@ -133,6 +133,7 @@ int nfs41_rpc_clnt_create(
         status = GetLastError();
         goto out;
     }
+    rpc->needcb = needcb;
     rpc->cond = CreateEvent(NULL, TRUE, FALSE, "rpc_recovery_cond");
     if (rpc->cond == NULL) {
         status = GetLastError();
@@ -282,6 +283,16 @@ static int rpc_reconnect(
 
 out_unlock:
     ReleaseSRWLockExclusive(&rpc->lock);
+
+    /* after releasing the rpc lock, send a BIND_CONN_TO_SESSION if
+     * we need to associate the connection with the backchannel */
+    if (status == NO_ERROR && rpc->needcb) {
+        status = nfs41_bind_conn_to_session(rpc,
+            rpc->client->session->session_id, CDFC4_BACK_OR_BOTH);
+        if (status)
+            eprintf("nfs41_bind_conn_to_session() failed with %s\n",
+                nfs_error_string(status));
+    }
     return status;
 
 out_err_client: