NSM: Move nsm_find() to fs/lockd/mon.c

[linux-2.6-omap-h63xx.git] / fs / lockd / host.c

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 1d523c1a7b6278ee1894e77e19fbde13ab3b972d..dbdeaa88d2fab0744797dc63cca2414d2df6eeaf 100644 (file)
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -32,12 +32,6 @@ static int                   nrhosts;
 static DEFINE_MUTEX(nlm_host_mutex);
 
 static void                    nlm_gc_hosts(void);
-static struct nsm_handle       *nsm_find(const struct sockaddr *sap,
-                                               const size_t salen,
-                                               const char *hostname,
-                                               const size_t hostname_len,
-                                               const int create);
-static void                    nsm_release(struct nsm_handle *nsm);
 
 struct nlm_lookup_host_info {
        const int               server;         /* search for server|client */
@@ -106,43 +100,6 @@ static void nlm_clear_port(struct sockaddr *sap)
        }
 }
 
-static void nlm_display_ipv4_address(const struct sockaddr *sap, char *buf,
-                                    const size_t len)
-{
-       const struct sockaddr_in *sin = (struct sockaddr_in *)sap;
-       snprintf(buf, len, "%pI4", &sin->sin_addr.s_addr);
-}
-
-static void nlm_display_ipv6_address(const struct sockaddr *sap, char *buf,
-                                    const size_t len)
-{
-       const struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
-
-       if (ipv6_addr_v4mapped(&sin6->sin6_addr))
-               snprintf(buf, len, "%pI4", &sin6->sin6_addr.s6_addr32[3]);
-       else if (sin6->sin6_scope_id != 0)
-               snprintf(buf, len, "%pI6%%%u", &sin6->sin6_addr,
-                               sin6->sin6_scope_id);
-       else
-               snprintf(buf, len, "%pI6", &sin6->sin6_addr);
-}
-
-static void nlm_display_address(const struct sockaddr *sap,
-                               char *buf, const size_t len)
-{
-       switch (sap->sa_family) {
-       case AF_INET:
-               nlm_display_ipv4_address(sap, buf, len);
-               break;
-       case AF_INET6:
-               nlm_display_ipv6_address(sap, buf, len);
-               break;
-       default:
-               snprintf(buf, len, "unsupported address family");
-               break;
-       }
-}
-
 /*
  * Common host lookup routine for server & client
  */
@@ -635,88 +592,3 @@ nlm_gc_hosts(void)
 
        next_gc = jiffies + NLM_HOST_COLLECT;
 }
-
-
-/*
- * Manage NSM handles
- */
-static LIST_HEAD(nsm_handles);
-static DEFINE_SPINLOCK(nsm_lock);
-
-static struct nsm_handle *nsm_find(const struct sockaddr *sap,
-                                  const size_t salen,
-                                  const char *hostname,
-                                  const size_t hostname_len,
-                                  const int create)
-{
-       struct nsm_handle *nsm = NULL;
-       struct nsm_handle *pos;
-
-       if (!sap)
-               return NULL;
-
-       if (hostname && memchr(hostname, '/', hostname_len) != NULL) {
-               if (printk_ratelimit()) {
-                       printk(KERN_WARNING "Invalid hostname \"%.*s\" "
-                                           "in NFS lock request\n",
-                               (int)hostname_len, hostname);
-               }
-               return NULL;
-       }
-
-retry:
-       spin_lock(&nsm_lock);
-       list_for_each_entry(pos, &nsm_handles, sm_link) {
-
-               if (hostname && nsm_use_hostnames) {
-                       if (strlen(pos->sm_name) != hostname_len
-                        || memcmp(pos->sm_name, hostname, hostname_len))
-                               continue;
-               } else if (!nlm_cmp_addr(nsm_addr(pos), sap))
-                       continue;
-               atomic_inc(&pos->sm_count);
-               kfree(nsm);
-               nsm = pos;
-               goto found;
-       }
-       if (nsm) {
-               list_add(&nsm->sm_link, &nsm_handles);
-               goto found;
-       }
-       spin_unlock(&nsm_lock);
-
-       if (!create)
-               return NULL;
-
-       nsm = kzalloc(sizeof(*nsm) + hostname_len + 1, GFP_KERNEL);
-       if (nsm == NULL)
-               return NULL;
-
-       memcpy(nsm_addr(nsm), sap, salen);
-       nsm->sm_addrlen = salen;
-       nsm->sm_name = (char *) (nsm + 1);
-       memcpy(nsm->sm_name, hostname, hostname_len);
-       nsm->sm_name[hostname_len] = '\0';
-       nlm_display_address((struct sockaddr *)&nsm->sm_addr,
-                               nsm->sm_addrbuf, sizeof(nsm->sm_addrbuf));
-       atomic_set(&nsm->sm_count, 1);
-       goto retry;
-
-found:
-       spin_unlock(&nsm_lock);
-       return nsm;
-}
-
-/*
- * Release an NSM handle
- */
-static void nsm_release(struct nsm_handle *nsm)
-{
-       if (!nsm)
-               return;
-       if (atomic_dec_and_lock(&nsm->sm_count, &nsm_lock)) {
-               list_del(&nsm->sm_link);
-               spin_unlock(&nsm_lock);
-               kfree(nsm);
-       }
-}