Commit c81468a1 authored by Trond Myklebust's avatar Trond Myklebust

NFS: Clean up the nfs_find_client function.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 3a498026
...@@ -208,52 +208,60 @@ void nfs_put_client(struct nfs_client *clp) ...@@ -208,52 +208,60 @@ void nfs_put_client(struct nfs_client *clp)
} }
/* /*
* Find a client by address * Find a client by IP address and protocol version
* - caller must hold nfs_client_lock * - 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; struct nfs_client *clp;
spin_lock(&nfs_client_lock);
list_for_each_entry(clp, &nfs_client_list, cl_share_link) { list_for_each_entry(clp, &nfs_client_list, cl_share_link) {
/* Don't match clients that failed to initialise properly */ /* Don't match clients that failed to initialise properly */
if (clp->cl_cons_state < 0) if (clp->cl_cons_state != NFS_CS_READY)
continue; continue;
/* Different NFS versions cannot share the same nfs_client */ /* Different NFS versions cannot share the same nfs_client */
if (clp->cl_nfsversion != nfsversion) if (clp->cl_nfsversion != nfsversion)
continue; continue;
/* Match only the IP address, not the port number */
if (clp->cl_addr.sin_addr.s_addr != addr->sin_addr.s_addr) if (clp->cl_addr.sin_addr.s_addr != addr->sin_addr.s_addr)
continue; continue;
if (!match_port || clp->cl_addr.sin_port == addr->sin_port) atomic_inc(&clp->cl_count);
goto found; spin_unlock(&nfs_client_lock);
return clp;
} }
spin_unlock(&nfs_client_lock);
return NULL; return NULL;
found:
atomic_inc(&clp->cl_count);
return clp;
} }
/* /*
* Find a client by IP address and protocol version * Find an nfs_client on the list that matches the initialisation data
* - returns NULL if no such client * that is supplied.
*/ */
struct nfs_client *nfs_find_client(const struct sockaddr_in *addr, int nfsversion) static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *data)
{ {
struct nfs_client *clp; struct nfs_client *clp;
spin_lock(&nfs_client_lock); list_for_each_entry(clp, &nfs_client_list, cl_share_link) {
clp = __nfs_find_client(addr, nfsversion, 0); /* Don't match clients that failed to initialise properly */
spin_unlock(&nfs_client_lock); if (clp->cl_cons_state < 0)
if (clp != NULL && clp->cl_cons_state != NFS_CS_READY) { continue;
nfs_put_client(clp);
clp = NULL; /* Different NFS versions cannot share the same nfs_client */
if (clp->cl_nfsversion != data->version)
continue;
/* Match the full socket address */
if (memcmp(&clp->cl_addr, data->addr, sizeof(clp->cl_addr)) != 0)
continue;
atomic_inc(&clp->cl_count);
return clp;
} }
return clp; return NULL;
} }
/* /*
...@@ -273,7 +281,7 @@ static struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_in ...@@ -273,7 +281,7 @@ static struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_in
do { do {
spin_lock(&nfs_client_lock); spin_lock(&nfs_client_lock);
clp = __nfs_find_client(cl_init->addr, cl_init->version, 1); clp = nfs_match_client(cl_init);
if (clp) if (clp)
goto found_client; goto found_client;
if (new) if (new)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment