lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nfsd4: replace unintuitive match_clientid_establishment

Browse Source 
Reviewed-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields
2010-11-24 17:17:34 -05:00
parent ec66ee3797
commit 6e5f15c93d
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/nfsd/nfs4state.c
View File

@@ -1135,19 +1135,13 @@ find_unconfirmed_client(clientid_t *clid)
} }
/* /*
* Return 1 iff clp's clientid establishment method matches the use_exchange_id
* parameter. Matching is based on the fact the at least one of the
* EXCHGID4_FLAG_USE_{NON_PNFS,PNFS_MDS,PNFS_DS} flags must be set for v4.1
*
* FIXME: we need to unify the clientid namespaces for nfsv4.x * FIXME: we need to unify the clientid namespaces for nfsv4.x
* and correctly deal with client upgrade/downgrade in EXCHANGE_ID * and correctly deal with client upgrade/downgrade in EXCHANGE_ID
* and SET_CLIENTID{,_CONFIRM} * and SET_CLIENTID{,_CONFIRM}
*/ */
static inline int static bool clp_used_exchangeid(struct nfs4_client *clp)
match_clientid_establishment(struct nfs4_client *clp, bool use_exchange_id)
{ {
bool has_exchange_flags = (clp->cl_exchange_flags != 0); return clp->cl_exchange_flags != 0;
return use_exchange_id == has_exchange_flags;
} }
static struct nfs4_client * static struct nfs4_client *
@@ -1158,7 +1152,7 @@ find_confirmed_client_by_str(const char *dname, unsigned int hashval,
list_for_each_entry(clp, &conf_str_hashtbl[hashval], cl_strhash) { list_for_each_entry(clp, &conf_str_hashtbl[hashval], cl_strhash) {
if (same_name(clp->cl_recdir, dname) && if (same_name(clp->cl_recdir, dname) &&
match_clientid_establishment(clp, use_exchange_id)) clp_used_exchangeid(clp) == use_exchange_id)
return clp; return clp;
} }
return NULL; return NULL;
@@ -1172,7 +1166,7 @@ find_unconfirmed_client_by_str(const char *dname, unsigned int hashval,
list_for_each_entry(clp, &unconf_str_hashtbl[hashval], cl_strhash) { list_for_each_entry(clp, &unconf_str_hashtbl[hashval], cl_strhash) {
if (same_name(clp->cl_recdir, dname) && if (same_name(clp->cl_recdir, dname) &&
match_clientid_establishment(clp, use_exchange_id)) clp_used_exchangeid(clp) == use_exchange_id)
return clp; return clp;
} }
return NULL; return NULL;