2 files changed, 4 insertions, 5 deletions

diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index 936e0dc52fcc..1b5da39bb461 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -50,11 +50,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 */
+#define XPT_CACHE_AUTH  12              /* cache auth info */
 
         struct svc_pool         *xpt_pool;      /* current pool iff queued */
         struct svc_serv         *xpt_server;    /* service for transport */
         atomic_t                xpt_reserved;   /* space on outq that is rsvd */
         struct mutex            xpt_mutex;      /* to serialize sending data */
+        spinlock_t              xpt_lock;       /* protects sk_deferred
+                                                 * and xpt_auth_cache */
+        void                    *xpt_auth_cache;/* auth cache */
 };
 
 int     svc_reg_xprt_class(struct svc_xprt_class *);
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index 406d0031b989..f2ed6a25a7aa 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -20,8 +20,6 @@ struct svc_sock {
         struct socket *         sk_sock;        /* berkeley socket layer */
         struct sock *           sk_sk;          /* INET layer */
 
-        spinlock_t              sk_lock;        /* protects sk_deferred and
-                                                 * sk_info_authunix */
         struct list_head        sk_deferred;    /* deferred requests that need to
                                                  * be revisted */
 
@@ -34,9 +32,6 @@ struct svc_sock {
         int                     sk_reclen;      /* length of record */
         int                     sk_tcplen;      /* current read length */
 
-        /* cache of various info for TCP sockets */
-        void                    *sk_info_authunix;
-
         struct sockaddr_storage sk_local;       /* local address */
         struct sockaddr_storage sk_remote;      /* remote peer's address */
         int                     sk_remotelen;   /* length of address */