mmc_block: wait for card even on failures

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

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index c3f119426d832ea396ebffbcd2820e335477bd8b..a17664c7eacc4542ee8a27a6543c4b548f6efc62 100644 (file)
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -41,11 +41,12 @@ static struct nsm_handle *  nsm_find(const struct sockaddr_in *sin,
 /*
  * Common host lookup routine for server & client
  */
-static struct nlm_host *
-nlm_lookup_host(int server, const struct sockaddr_in *sin,
-               int proto, int version, const char *hostname,
-               unsigned int hostname_len,
-               const struct sockaddr_in *ssin)
+static struct nlm_host *nlm_lookup_host(int server,
+                                       const struct sockaddr_in *sin,
+                                       int proto, u32 version,
+                                       const char *hostname,
+                                       unsigned int hostname_len,
+                                       const struct sockaddr_in *ssin)
 {
        struct hlist_head *chain;
        struct hlist_node *pos;
@@ -54,7 +55,7 @@ nlm_lookup_host(int server, const struct sockaddr_in *sin,
        int             hash;
 
        dprintk("lockd: nlm_lookup_host("NIPQUAD_FMT"->"NIPQUAD_FMT
-                       ", p=%d, v=%d, my role=%s, name=%.*s)\n",
+                       ", p=%d, v=%u, my role=%s, name=%.*s)\n",
                        NIPQUAD(ssin->sin_addr.s_addr),
                        NIPQUAD(sin->sin_addr.s_addr), proto, version,
                        server? "server" : "client",
@@ -172,9 +173,10 @@ nlm_destroy_host(struct nlm_host *host)
 /*
  * Find an NLM server handle in the cache. If there is none, create it.
  */
-struct nlm_host *
-nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version,
-                       const char *hostname, unsigned int hostname_len)
+struct nlm_host *nlmclnt_lookup_host(const struct sockaddr_in *sin,
+                                    int proto, u32 version,
+                                    const char *hostname,
+                                    unsigned int hostname_len)
 {
        struct sockaddr_in ssin = {0};
 
@@ -457,7 +459,7 @@ nlm_gc_hosts(void)
  * Manage NSM handles
  */
 static LIST_HEAD(nsm_handles);
-static DEFINE_MUTEX(nsm_mutex);
+static DEFINE_SPINLOCK(nsm_lock);
 
 static struct nsm_handle *
 __nsm_find(const struct sockaddr_in *sin,
@@ -465,7 +467,7 @@ __nsm_find(const struct sockaddr_in *sin,
                int create)
 {
        struct nsm_handle *nsm = NULL;
-       struct list_head *pos;
+       struct nsm_handle *pos;
 
        if (!sin)
                return NULL;
@@ -479,38 +481,43 @@ __nsm_find(const struct sockaddr_in *sin,
                return NULL;
        }
 
-       mutex_lock(&nsm_mutex);
-       list_for_each(pos, &nsm_handles) {
-               nsm = list_entry(pos, struct nsm_handle, sm_link);
+retry:
+       spin_lock(&nsm_lock);
+       list_for_each_entry(pos, &nsm_handles, sm_link) {
 
                if (hostname && nsm_use_hostnames) {
-                       if (strlen(nsm->sm_name) != hostname_len
-                        || memcmp(nsm->sm_name, hostname, hostname_len))
+                       if (strlen(pos->sm_name) != hostname_len
+                        || memcmp(pos->sm_name, hostname, hostname_len))
                                continue;
-               } else if (!nlm_cmp_addr(&nsm->sm_addr, sin))
+               } else if (!nlm_cmp_addr(&pos->sm_addr, sin))
                        continue;
-               atomic_inc(&nsm->sm_count);
-               goto out;
+               atomic_inc(&pos->sm_count);
+               kfree(nsm);
+               nsm = pos;
+               goto found;
        }
-
-       if (!create) {
-               nsm = NULL;
-               goto out;
+       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) {
-               nsm->sm_addr = *sin;
-               nsm->sm_name = (char *) (nsm + 1);
-               memcpy(nsm->sm_name, hostname, hostname_len);
-               nsm->sm_name[hostname_len] = '\0';
-               atomic_set(&nsm->sm_count, 1);
+       if (nsm == NULL)
+               return NULL;
 
-               list_add(&nsm->sm_link, &nsm_handles);
-       }
+       nsm->sm_addr = *sin;
+       nsm->sm_name = (char *) (nsm + 1);
+       memcpy(nsm->sm_name, hostname, hostname_len);
+       nsm->sm_name[hostname_len] = '\0';
+       atomic_set(&nsm->sm_count, 1);
+       goto retry;
 
-out:
-       mutex_unlock(&nsm_mutex);
+found:
+       spin_unlock(&nsm_lock);
        return nsm;
 }
 
@@ -529,12 +536,9 @@ nsm_release(struct nsm_handle *nsm)
 {
        if (!nsm)
                return;
-       if (atomic_dec_and_test(&nsm->sm_count)) {
-               mutex_lock(&nsm_mutex);
-               if (atomic_read(&nsm->sm_count) == 0) {
-                       list_del(&nsm->sm_link);
-                       kfree(nsm);
-               }
-               mutex_unlock(&nsm_mutex);
+       if (atomic_dec_and_lock(&nsm->sm_count, &nsm_lock)) {
+               list_del(&nsm->sm_link);
+               spin_unlock(&nsm_lock);
+               kfree(nsm);
        }
 }