2 files changed, 5 insertions, 3 deletions

diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index 2edeb0d13a..4042cdfec4 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -48,11 +48,15 @@ struct svc_xprt {
 #define XPT_OLD         9               /* used for xprt aging mark+sweep */
 #define XPT_DETACHED    10              /* detached from tempsocks list */
 #define XPT_LISTENER    11              /* listening endpoint */
+
+        struct svc_pool         *xpt_pool;      /* current pool iff queued */
+        struct svc_serv         *xpt_server;    /* service for transport */
 };
 
 int     svc_reg_xprt_class(struct svc_xprt_class *);
 void    svc_unreg_xprt_class(struct svc_xprt_class *);
-void    svc_xprt_init(struct svc_xprt_class *, struct svc_xprt *);
+void    svc_xprt_init(struct svc_xprt_class *, struct svc_xprt *,
+                      struct svc_serv *);
 int     svc_create_xprt(struct svc_serv *, char *, unsigned short, int);
 void    svc_xprt_put(struct svc_xprt *xprt);
 
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index b8a8496dfc..92d4cc99c6 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -22,8 +22,6 @@ struct svc_sock {
         struct socket *         sk_sock;        /* berkeley socket layer */
         struct sock *           sk_sk;          /* INET layer */
 
-        struct svc_pool *       sk_pool;        /* current pool iff queued */
-        struct svc_serv *       sk_server;      /* service for this socket */
         atomic_t                sk_reserved;    /* space on outq that is reserved */
 
         spinlock_t              sk_lock;        /* protects sk_deferred and