NFS: Clean up the nfs_find_client function.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index d7f6d50..ff778ec 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -208,10 +208,40 @@
}
/*
- * Find a client by address
- * - caller must hold nfs_client_lock
+ * Find a client by IP address and protocol version
+ * - returns NULL if no such client
*/
-static struct nfs_client *__nfs_find_client(const struct sockaddr_in *addr, int nfsversion, int match_port)
+struct nfs_client *nfs_find_client(const struct sockaddr_in *addr, int nfsversion)
+{
+ struct nfs_client *clp;
+
+ spin_lock(&nfs_client_lock);
+ list_for_each_entry(clp, &nfs_client_list, cl_share_link) {
+ /* Don't match clients that failed to initialise properly */
+ if (clp->cl_cons_state != NFS_CS_READY)
+ continue;
+
+ /* Different NFS versions cannot share the same nfs_client */
+ if (clp->cl_nfsversion != nfsversion)
+ continue;
+
+ /* Match only the IP address, not the port number */
+ if (clp->cl_addr.sin_addr.s_addr != addr->sin_addr.s_addr)
+ continue;
+
+ atomic_inc(&clp->cl_count);
+ spin_unlock(&nfs_client_lock);
+ return clp;
+ }
+ spin_unlock(&nfs_client_lock);
+ return NULL;
+}
+
+/*
+ * Find an nfs_client on the list that matches the initialisation data
+ * that is supplied.
+ */
+static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *data)
{
struct nfs_client *clp;
@@ -221,39 +251,17 @@
continue;
/* Different NFS versions cannot share the same nfs_client */
- if (clp->cl_nfsversion != nfsversion)
+ if (clp->cl_nfsversion != data->version)
continue;
- if (clp->cl_addr.sin_addr.s_addr != addr->sin_addr.s_addr)
+ /* Match the full socket address */
+ if (memcmp(&clp->cl_addr, data->addr, sizeof(clp->cl_addr)) != 0)
continue;
- if (!match_port || clp->cl_addr.sin_port == addr->sin_port)
- goto found;
+ atomic_inc(&clp->cl_count);
+ return clp;
}
-
return NULL;
-
-found:
- atomic_inc(&clp->cl_count);
- return clp;
-}
-
-/*
- * Find a client by IP address and protocol version
- * - returns NULL if no such client
- */
-struct nfs_client *nfs_find_client(const struct sockaddr_in *addr, int nfsversion)
-{
- struct nfs_client *clp;
-
- spin_lock(&nfs_client_lock);
- clp = __nfs_find_client(addr, nfsversion, 0);
- spin_unlock(&nfs_client_lock);
- if (clp != NULL && clp->cl_cons_state != NFS_CS_READY) {
- nfs_put_client(clp);
- clp = NULL;
- }
- return clp;
}
/*
@@ -273,7 +281,7 @@
do {
spin_lock(&nfs_client_lock);
- clp = __nfs_find_client(cl_init->addr, cl_init->version, 1);
+ clp = nfs_match_client(cl_init);
if (clp)
goto found_client;
if (new)
