Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9346eff0 authored by Krishna Kumar's avatar Krishna Kumar Committed by J. Bruce Fields
Browse files

nfsd: Minor cleanup of find_stateid 



Minor cleanup/rewrite of find_stateid. Compile tested.

Signed-off-by: default avatarKrishna Kumar <krkumar2@in.ibm.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent b3d47676

fs/nfsd/nfs4state.c

+4 −3
Original line number Diff line number Diff line
@@ -2435,13 +2435,13 @@ static struct list_head lockstateid_hashtbl[STATEID_HASH_SIZE]; 
static struct nfs4_stateid *

find_stateid(stateid_t *stid, int flags)

{

	struct nfs4_stateid *local = NULL;

	struct nfs4_stateid *local;

	u32 st_id = stid->si_stateownerid;

	u32 f_id = stid->si_fileid;

	unsigned int hashval;



	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);

		list_for_each_entry(local, &lockstateid_hashtbl[hashval], st_hash) {

			if ((local->st_stateid.si_stateownerid == st_id) &&
@@ -2449,7 +2449,8 @@ find_stateid(stateid_t *stid, int flags) 
				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);

		list_for_each_entry(local, &stateid_hashtbl[hashval], st_hash) {

			if ((local->st_stateid.si_stateownerid == st_id) &&