3 files changed, 2 insertions, 39 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 3b55fe5e94a2..1bf384307d15 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -192,33 +192,6 @@ nlm_destroy_host(struct nlm_host *host)
         kfree(host);
 }
 
-struct nlm_host *
-nlm_find_client(void)
-{
-        struct hlist_head *chain;
-        struct hlist_node *pos;
-
-        /* find a nlm_host for a client for which h_killed == 0.
-         * and return it
-         */
-        mutex_lock(&nlm_host_mutex);
-        for (chain = nlm_hosts; chain < nlm_hosts + NLM_HOST_NRHASH; ++chain) {
-                struct nlm_host *host;
-
-                hlist_for_each_entry(host, pos, chain, h_hash) {
-                        if (host->h_server &&
-                            host->h_killed == 0) {
-                                nlm_get_host(host);
-                                mutex_unlock(&nlm_host_mutex);
-                                return host;
-                        }
-                }
-        }
-        mutex_unlock(&nlm_host_mutex);
-        return NULL;
-}
-
-                                
 /*
  * Create the NLM RPC client for an NLM peer
  */
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index bb13a48210f5..a1c7c0848415 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -354,13 +354,11 @@ nlmsvc_free_host_resources(struct nlm_host *host)
 }
 
 /*
- * delete all hosts structs for clients
+ * Remove all locks held for clients
  */
 void
 nlmsvc_invalidate_all(void)
 {
-        struct nlm_host *host;
-
         /* Release all locks held by NFS clients.
          * Previously, the code would call
          * nlmsvc_free_host_resources for each client in
@@ -368,10 +366,4 @@ nlmsvc_invalidate_all(void)
          * Now we just do it once in nlm_traverse_files.
          */
         nlm_traverse_files(NULL, nlmsvc_is_client);
-
-        while ((host = nlm_find_client()) != NULL) {
-                host->h_expires = 0;
-                host->h_killed = 1;
-                nlm_release_host(host);
-        }
 }
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 8c1145669d06..1fcf936d75b9 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -45,8 +45,7 @@ struct nlm_host {
         unsigned short          h_proto;        /* transport proto */
         unsigned short          h_reclaiming : 1,
                                 h_server     : 1, /* server side, not client side */
-                                h_inuse      : 1,
-                                h_killed     : 1;
+                                h_inuse      : 1;
         wait_queue_head_t       h_gracewait;    /* wait while reclaiming */
         struct rw_semaphore     h_rwsem;        /* Reboot recovery lock */
         u32                     h_state;        /* pseudo-state counter */
@@ -169,7 +168,6 @@ void		  nlm_rebind_host(struct nlm_host *);
 struct nlm_host * nlm_get_host(struct nlm_host *);
 void              nlm_release_host(struct nlm_host *);
 void              nlm_shutdown_hosts(void);
-extern struct nlm_host *nlm_find_client(void);
 extern void       nlm_host_rebooted(const struct sockaddr_in *, const char *, int, u32);
 struct nsm_handle *nsm_find(const struct sockaddr_in *, const char *, int);
 void              nsm_release(struct nsm_handle *);