Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 09:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

nfsd4: clientid lookup cleanup

Browse Source 
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2013-03-14 18:24:52 -04:00
parent c0293b0131
commit bfa85e83a8
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/nfsd/nfs4state.c
View File

@ -1380,12 +1380,12 @@ move_to_confirmed(struct nfs4_client *clp)
} }
static struct nfs4_client * static struct nfs4_client *
find_confirmed_client(clientid_t *clid, bool sessions, struct nfsd_net *nn) find_client_in_id_table(struct list_head *tbl, clientid_t *clid, bool sessions)
{ {
struct nfs4_client *clp; struct nfs4_client *clp;
unsigned int idhashval = clientid_hashval(clid->cl_id); unsigned int idhashval = clientid_hashval(clid->cl_id);
list_for_each_entry(clp, &nn->conf_id_hashtbl[idhashval], cl_idhash) { list_for_each_entry(clp, &tbl[idhashval], cl_idhash) {
if (same_clid(&clp->cl_clientid, clid)) { if (same_clid(&clp->cl_clientid, clid)) {
if ((bool)clp->cl_minorversion != sessions) if ((bool)clp->cl_minorversion != sessions)
return NULL; return NULL;
@ -1396,20 +1396,20 @@ find_confirmed_client(clientid_t *clid, bool sessions, struct nfsd_net *nn)
return NULL; return NULL;
} }
static struct nfs4_client *
find_confirmed_client(clientid_t *clid, bool sessions, struct nfsd_net *nn)
{
struct list_head *tbl = nn->conf_id_hashtbl;
return find_client_in_id_table(tbl, clid, sessions);
}
static struct nfs4_client * static struct nfs4_client *
find_unconfirmed_client(clientid_t *clid, bool sessions, struct nfsd_net *nn) find_unconfirmed_client(clientid_t *clid, bool sessions, struct nfsd_net *nn)
{ {
struct nfs4_client *clp; struct list_head *tbl = nn->unconf_id_hashtbl;
unsigned int idhashval = clientid_hashval(clid->cl_id);
list_for_each_entry(clp, &nn->unconf_id_hashtbl[idhashval], cl_idhash) { return find_client_in_id_table(tbl, clid, sessions);
if (same_clid(&clp->cl_clientid, clid)) {
if ((bool)clp->cl_minorversion != sessions)
return NULL;
return clp;
}
}
return NULL;
} }
static bool clp_used_exchangeid(struct nfs4_client *clp) static bool clp_used_exchangeid(struct nfs4_client *clp)