Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

* 'for-linus' of git://linux-nfs.org/~bfields/linux: (100 commits)
  SUNRPC: RPC program information is stored in unsigned integers
  SUNRPC: Move exported symbol definitions after function declaration part 2
  NLM: tear down RPC clients in nlm_shutdown_hosts
  SUNRPC: spin svc_rqst initialization to its own function
  nfsd: more careful input validation in nfsctl write methods
  lockd: minor log message fix
  knfsd: don't bother mapping putrootfh enoent to eperm
  rdma: makefile
  rdma: ONCRPC RDMA protocol marshalling
  rdma: SVCRDMA sendto
  rdma: SVCRDMA recvfrom
  rdma: SVCRDMA Core Transport Services
  rdma: SVCRDMA Transport Module
  rdma: SVCRMDA Header File
  svc: Add svc_xprt_names service to replace svc_sock_names
  knfsd: Support adding transports by writing portlist file
  svc: Add svc API that queries for a transport instance
  svc: Add /proc/sys/sunrpc/transport files
  svc: Add transport hdr size for defer/revisit
  svc: Move the xprt independent code to the svc_xprt.c file
  ...

1 files changed, 34 insertions, 25 deletions

diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 411479411b21..3c64051e4555 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -63,6 +63,7 @@ struct auth_domain *unix_domain_find(char *name)
                 rv = auth_domain_lookup(name, &new->h);
         }
 }
+EXPORT_SYMBOL(unix_domain_find);
 
 static void svcauth_unix_domain_release(struct auth_domain *dom)
 {
@@ -340,6 +341,7 @@ int auth_unix_add_addr(struct in_addr addr, struct auth_domain *dom)
         else
                 return -ENOMEM;
 }
+EXPORT_SYMBOL(auth_unix_add_addr);
 
 int auth_unix_forget_old(struct auth_domain *dom)
 {
@@ -351,6 +353,7 @@ int auth_unix_forget_old(struct auth_domain *dom)
         udom->addr_changes++;
         return 0;
 }
+EXPORT_SYMBOL(auth_unix_forget_old);
 
 struct auth_domain *auth_unix_lookup(struct in_addr addr)
 {
@@ -375,50 +378,56 @@ struct auth_domain *auth_unix_lookup(struct in_addr addr)
         cache_put(&ipm->h, &ip_map_cache);
         return rv;
 }
+EXPORT_SYMBOL(auth_unix_lookup);
 
 void svcauth_unix_purge(void)
 {
         cache_purge(&ip_map_cache);
 }
+EXPORT_SYMBOL(svcauth_unix_purge);
 
 static inline struct ip_map *
 ip_map_cached_get(struct svc_rqst *rqstp)
 {
-        struct ip_map *ipm;
-        struct svc_sock *svsk = rqstp->rq_sock;
-        spin_lock(&svsk->sk_lock);
-        ipm = svsk->sk_info_authunix;
-        if (ipm != NULL) {
-                if (!cache_valid(&ipm->h)) {
-                        /*
-                         * The entry has been invalidated since it was
-                         * remembered, e.g. by a second mount from the
-                         * same IP address.
-                         */
-                        svsk->sk_info_authunix = NULL;
-                        spin_unlock(&svsk->sk_lock);
-                        cache_put(&ipm->h, &ip_map_cache);
-                        return NULL;
+        struct ip_map *ipm = NULL;
+        struct svc_xprt *xprt = rqstp->rq_xprt;
+
+        if (test_bit(XPT_CACHE_AUTH, &xprt->xpt_flags)) {
+                spin_lock(&xprt->xpt_lock);
+                ipm = xprt->xpt_auth_cache;
+                if (ipm != NULL) {
+                        if (!cache_valid(&ipm->h)) {
+                                /*
+                                 * The entry has been invalidated since it was
+                                 * remembered, e.g. by a second mount from the
+                                 * same IP address.
+                                 */
+                                xprt->xpt_auth_cache = NULL;
+                                spin_unlock(&xprt->xpt_lock);
+                                cache_put(&ipm->h, &ip_map_cache);
+                                return NULL;
+                        }
+                        cache_get(&ipm->h);
                 }
-                cache_get(&ipm->h);
+                spin_unlock(&xprt->xpt_lock);
         }
-        spin_unlock(&svsk->sk_lock);
         return ipm;
 }
 
 static inline void
 ip_map_cached_put(struct svc_rqst *rqstp, struct ip_map *ipm)
 {
-        struct svc_sock *svsk = rqstp->rq_sock;
+        struct svc_xprt *xprt = rqstp->rq_xprt;
 
-        spin_lock(&svsk->sk_lock);
-        if (svsk->sk_sock->type == SOCK_STREAM &&
-            svsk->sk_info_authunix == NULL) {
-                /* newly cached, keep the reference */
-                svsk->sk_info_authunix = ipm;
-                ipm = NULL;
+        if (test_bit(XPT_CACHE_AUTH, &xprt->xpt_flags)) {
+                spin_lock(&xprt->xpt_lock);
+                if (xprt->xpt_auth_cache == NULL) {
+                        /* newly cached, keep the reference */
+                        xprt->xpt_auth_cache = ipm;
+                        ipm = NULL;
+                }
+                spin_unlock(&xprt->xpt_lock);
         }
-        spin_unlock(&svsk->sk_lock);
         if (ipm)
                 cache_put(&ipm->h, &ip_map_cache);
 }