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

nfsd: Minor cleanup of find_stateid

Browse Source 
Minor cleanup/rewrite of find_stateid. Compile tested.

Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Krishna Kumar
2008-10-20 11:44:28 +05:30
committed by J. Bruce Fields
parent b3d47676d4
commit 9346eff0de
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/nfsd/nfs4state.c
View File

@@ -2435,13 +2435,13 @@ static struct list_head lockstateid_hashtbl[STATEID_HASH_SIZE];
static struct nfs4_stateid * static struct nfs4_stateid *
find_stateid(stateid_t *stid, int flags) find_stateid(stateid_t *stid, int flags)
{ {
struct nfs4_stateid *local = NULL; struct nfs4_stateid *local;
u32 st_id = stid->si_stateownerid; u32 st_id = stid->si_stateownerid;
u32 f_id = stid->si_fileid; u32 f_id = stid->si_fileid;
unsigned int hashval; unsigned int hashval;
dprintk("NFSD: find_stateid flags 0x%x\n",flags); dprintk("NFSD: find_stateid flags 0x%x\n",flags);
if ((flags & LOCK_STATE) || (flags & RD_STATE) || (flags & WR_STATE)) { if (flags & (LOCK_STATE | RD_STATE | WR_STATE)) {
hashval = stateid_hashval(st_id, f_id); hashval = stateid_hashval(st_id, f_id);
list_for_each_entry(local, &lockstateid_hashtbl[hashval], st_hash) { list_for_each_entry(local, &lockstateid_hashtbl[hashval], st_hash) {
if ((local->st_stateid.si_stateownerid == st_id) && if ((local->st_stateid.si_stateownerid == st_id) &&
@@ -2449,7 +2449,8 @@ find_stateid(stateid_t *stid, int flags)
return local; return local;
} }
} }
if ((flags & OPEN_STATE) || (flags & RD_STATE) || (flags & WR_STATE)) {
if (flags & (OPEN_STATE | RD_STATE | WR_STATE)) {
hashval = stateid_hashval(st_id, f_id); hashval = stateid_hashval(st_id, f_id);
list_for_each_entry(local, &stateid_hashtbl[hashval], st_hash) { list_for_each_entry(local, &stateid_hashtbl[hashval], st_hash) {
if ((local->st_stateid.si_stateownerid == st_id) && if ((local->st_stateid.si_stateownerid == st_id) &&