nfs4.1: add BIND_CONN_TO_SESSION operation

This patch adds the BIND_CONN_TO_SESSION operation which is needed for
upcoming SP4_MACH_CRED work and useful for recovering from broken connections
without destroying the session.

Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

2 files changed, 11 insertions, 0 deletions

diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 72b6bada0d79..a2b71cbfc44a 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -69,6 +69,10 @@
 #define NFS4_CDFC4_FORE_OR_BOTH 0x3
 #define NFS4_CDFC4_BACK_OR_BOTH 0x7
 
+#define NFS4_CDFS4_FORE 0x1
+#define NFS4_CDFS4_BACK 0x2
+#define NFS4_CDFS4_BOTH 0x3
+
 #define NFS4_SET_TO_SERVER_TIME 0
 #define NFS4_SET_TO_CLIENT_TIME 1
 
@@ -589,6 +593,7 @@ enum {
         NFSPROC4_CLNT_SECINFO,
 
         /* nfs41 */
+        NFSPROC4_CLNT_BIND_CONN_TO_SESSION,
         NFSPROC4_CLNT_EXCHANGE_ID,
         NFSPROC4_CLNT_CREATE_SESSION,
         NFSPROC4_CLNT_DESTROY_SESSION,
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 201c312152fb..6387fc0097fe 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1125,6 +1125,12 @@ struct nfs41_impl_id {
         struct nfstime4                 date;
 };
 
+struct nfs41_bind_conn_to_session_res {
+        struct nfs4_session             *session;
+        u32                             dir;
+        bool                            use_conn_in_rdma_mode;
+};
+
 struct nfs41_exchange_id_res {
         struct nfs_client               *client;
         u32                             flags;