leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFS: Clean up the nfs_find_client function.

Browse Source 
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2007-12-14 14:56:05 -05:00
parent 3a498026ee
commit c81468a1a7
1 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
fs/nfs/client.c
View File

@ -208,10 +208,40 @@ 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;
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; struct nfs_client *clp;
@ -221,39 +251,17 @@ static struct nfs_client *__nfs_find_client(const struct sockaddr_in *addr, int
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 != data->version)
continue; 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; continue;
if (!match_port || clp->cl_addr.sin_port == addr->sin_port) atomic_inc(&clp->cl_count);
goto found; return clp;
} }
return NULL; 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 @@ 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)