1 files changed, 0 insertions, 78 deletions

diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index c8e10216c113..31b9dea1bedd 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -30,9 +30,6 @@
 
 struct unix_domain {
         struct auth_domain      h;
-#ifdef CONFIG_NFSD_DEPRECATED
-        int     addr_changes;
-#endif /* CONFIG_NFSD_DEPRECATED */
         /* other stuff later */
 };
 
@@ -74,9 +71,6 @@ struct auth_domain *unix_domain_find(char *name)
                         return NULL;
                 }
                 new->h.flavour = &svcauth_unix;
-#ifdef CONFIG_NFSD_DEPRECATED
-                new->addr_changes = 0;
-#endif /* CONFIG_NFSD_DEPRECATED */
                 rv = auth_domain_lookup(name, &new->h);
         }
 }
@@ -95,9 +89,6 @@ struct ip_map {
         char                    m_class[8]; /* e.g. "nfsd" */
         struct in6_addr         m_addr;
         struct unix_domain      *m_client;
-#ifdef CONFIG_NFSD_DEPRECATED
-        int                     m_add_change;
-#endif /* CONFIG_NFSD_DEPRECATED */
 };
 
 static void ip_map_put(struct kref *kref)
@@ -151,9 +142,6 @@ static void update(struct cache_head *cnew, struct cache_head *citem)
 
         kref_get(&item->m_client->h.ref);
         new->m_client = item->m_client;
-#ifdef CONFIG_NFSD_DEPRECATED
-        new->m_add_change = item->m_add_change;
-#endif /* CONFIG_NFSD_DEPRECATED */
 }
 static struct cache_head *ip_map_alloc(void)
 {
@@ -338,16 +326,6 @@ static int __ip_map_update(struct cache_detail *cd, struct ip_map *ipm,
         ip.h.flags = 0;
         if (!udom)
                 set_bit(CACHE_NEGATIVE, &ip.h.flags);
-#ifdef CONFIG_NFSD_DEPRECATED
-        else {
-                ip.m_add_change = udom->addr_changes;
-                /* if this is from the legacy set_client system call,
-                 * we need m_add_change to be one higher
-                 */
-                if (expiry == NEVER)
-                        ip.m_add_change++;
-        }
-#endif /* CONFIG_NFSD_DEPRECATED */
         ip.h.expiry_time = expiry;
         ch = sunrpc_cache_update(cd, &ip.h, &ipm->h,
                                  hash_str(ipm->m_class, IP_HASHBITS) ^
@@ -367,62 +345,6 @@ static inline int ip_map_update(struct net *net, struct ip_map *ipm,
         return __ip_map_update(sn->ip_map_cache, ipm, udom, expiry);
 }
 
-#ifdef CONFIG_NFSD_DEPRECATED
-int auth_unix_add_addr(struct net *net, struct in6_addr *addr, struct auth_domain *dom)
-{
-        struct unix_domain *udom;
-        struct ip_map *ipmp;
-
-        if (dom->flavour != &svcauth_unix)
-                return -EINVAL;
-        udom = container_of(dom, struct unix_domain, h);
-        ipmp = ip_map_lookup(net, "nfsd", addr);
-
-        if (ipmp)
-                return ip_map_update(net, ipmp, udom, NEVER);
-        else
-                return -ENOMEM;
-}
-EXPORT_SYMBOL_GPL(auth_unix_add_addr);
-
-int auth_unix_forget_old(struct auth_domain *dom)
-{
-        struct unix_domain *udom;
-
-        if (dom->flavour != &svcauth_unix)
-                return -EINVAL;
-        udom = container_of(dom, struct unix_domain, h);
-        udom->addr_changes++;
-        return 0;
-}
-EXPORT_SYMBOL_GPL(auth_unix_forget_old);
-
-struct auth_domain *auth_unix_lookup(struct net *net, struct in6_addr *addr)
-{
-        struct ip_map *ipm;
-        struct auth_domain *rv;
-        struct sunrpc_net *sn;
-
-        sn = net_generic(net, sunrpc_net_id);
-        ipm = ip_map_lookup(net, "nfsd", addr);
-
-        if (!ipm)
-                return NULL;
-        if (cache_check(sn->ip_map_cache, &ipm->h, NULL))
-                return NULL;
-
-        if ((ipm->m_client->addr_changes - ipm->m_add_change) >0) {
-                sunrpc_invalidate(&ipm->h, sn->ip_map_cache);
-                rv = NULL;
-        } else {
-                rv = &ipm->m_client->h;
-                kref_get(&rv->ref);
-        }
-        cache_put(&ipm->h, sn->ip_map_cache);
-        return rv;
-}
-EXPORT_SYMBOL_GPL(auth_unix_lookup);
-#endif /* CONFIG_NFSD_DEPRECATED */
 
 void svcauth_unix_purge(void)
 {