2 files changed, 30 insertions, 0 deletions

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 2a30775959e9..4a8afbd62007 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -96,6 +96,14 @@ struct svc_serv {
         svc_thread_fn           sv_function;    /* main function for threads */
         unsigned int            sv_drc_max_pages; /* Total pages for DRC */
         unsigned int            sv_drc_pages_used;/* DRC pages used */
+#if defined(CONFIG_NFS_V4_1)
+        struct list_head        sv_cb_list;     /* queue for callback requests
+                                                 * that arrive over the same
+                                                 * connection */
+        spinlock_t              sv_cb_lock;     /* protects the svc_cb_list */
+        wait_queue_head_t       sv_cb_waitq;    /* sleep here if there are no
+                                                 * entries in the svc_cb_list */
+#endif /* CONFIG_NFS_V4_1 */
 };
 
 /*
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 08afe43118f4..703af7ebf6cf 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -97,6 +97,12 @@ struct rpc_rqst {
 
         unsigned long           rq_xtime;       /* when transmitted */
         int                     rq_ntrans;
+
+#if defined(CONFIG_NFS_V4_1)
+        struct list_head        rq_bc_list;     /* Callback service list */
+        unsigned long           rq_bc_pa_state; /* Backchannel prealloc state */
+        struct list_head        rq_bc_pa_list;  /* Backchannel prealloc list */
+#endif /* CONFIG_NFS_V4_1 */
 };
 #define rq_svec                 rq_snd_buf.head
 #define rq_slen                 rq_snd_buf.len
@@ -174,6 +180,14 @@ struct rpc_xprt {
         spinlock_t              reserve_lock;   /* lock slot table */
         u32                     xid;            /* Next XID value to use */
         struct rpc_task *       snd_task;       /* Task blocked in send */
+#if defined(CONFIG_NFS_V4_1)
+        struct svc_serv         *bc_serv;       /* The RPC service which will */
+                                                /* process the callback */
+        spinlock_t              bc_pa_lock;     /* Protects the preallocated
+                                                 * items */
+        struct list_head        bc_pa_list;     /* List of preallocated
+                                                 * backchannel rpc_rqst's */
+#endif /* CONFIG_NFS_V4_1 */
         struct list_head        recv;
 
         struct {
@@ -192,6 +206,14 @@ struct rpc_xprt {
         const char              *address_strings[RPC_DISPLAY_MAX];
 };
 
+#if defined(CONFIG_NFS_V4_1)
+/*
+ * Backchannel flags
+ */
+#define RPC_BC_PA_IN_USE        0x0001          /* Preallocated backchannel */
+                                                /* buffer in use */
+#endif /* CONFIG_NFS_V4_1 */
+
 struct xprt_create {
         int                     ident;          /* XPRT_TRANSPORT identifier */
         struct sockaddr *       srcaddr;        /* optional local address */