svc: Move sk_server and sk_pool to svc_xprt

This is another incremental change that moves transport independent
fields from svc_sock to the svc_xprt structure. The changes
should be functionally null.

Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
Acked-by: Neil Brown <neilb@suse.de>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Greg Banks <gnb@sgi.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

1 files changed, 5 insertions, 1 deletions

diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index 2edeb0d13ac2..4042cdfec4fe 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);