svc: Move sk_flags to the svc_xprt structure

This functionally trivial change moves the transport independent sk_flags
field to the transport independent svc_xprt structure.

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>

2 files changed, 12 insertions, 13 deletions

diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index 6374805887a6..2edeb0d13ac2 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -36,6 +36,18 @@ struct svc_xprt {
         struct svc_xprt_class   *xpt_class;
         struct svc_xprt_ops     *xpt_ops;
         struct kref             xpt_ref;
+        unsigned long           xpt_flags;
+#define XPT_BUSY        0               /* enqueued/receiving */
+#define XPT_CONN        1               /* conn pending */
+#define XPT_CLOSE       2               /* dead or dying */
+#define XPT_DATA        3               /* data pending */
+#define XPT_TEMP        4               /* connected transport */
+#define XPT_DEAD        6               /* transport closed */
+#define XPT_CHNGBUF     7               /* need to change snd/rcv buf sizes */
+#define XPT_DEFERRED    8               /* deferred request pending */
+#define XPT_OLD         9               /* used for xprt aging mark+sweep */
+#define XPT_DETACHED    10              /* detached from tempsocks list */
+#define XPT_LISTENER    11              /* listening endpoint */
 };
 
 int     svc_reg_xprt_class(struct svc_xprt_class *);
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index ba07d50cb11b..b8a8496dfc7c 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -24,19 +24,6 @@ struct svc_sock {
 
         struct svc_pool *       sk_pool;        /* current pool iff queued */
         struct svc_serv *       sk_server;      /* service for this socket */
-        unsigned long           sk_flags;
-#define SK_BUSY         0                       /* enqueued/receiving */
-#define SK_CONN         1                       /* conn pending */
-#define SK_CLOSE        2                       /* dead or dying */
-#define SK_DATA         3                       /* data pending */
-#define SK_TEMP         4                       /* temp (TCP) socket */
-#define SK_DEAD         6                       /* socket closed */
-#define SK_CHNGBUF      7                       /* need to change snd/rcv buffer sizes */
-#define SK_DEFERRED     8                       /* request on sk_deferred */
-#define SK_OLD          9                       /* used for temp socket aging mark+sweep */
-#define SK_DETACHED     10                      /* detached from tempsocks list */
-#define SK_LISTENER     11                      /* listening endpoint */
-
         atomic_t                sk_reserved;    /* space on outq that is reserved */
 
         spinlock_t              sk_lock;        /* protects sk_deferred and