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

Commit b79abadd authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: consolidate lock & open stateid tables 



There's no reason to have two separate hash tables for open and lock
stateid's.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 5fa0bbb4

fs/nfsd/nfs4state.c

+15 −48
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static u64 current_sessionid = 1; 


/* forward declarations */

static struct nfs4_stateid * find_stateid(stateid_t *stid, int flags);

static struct nfs4_stateid * search_for_stateid(stateid_t *stid);

static struct nfs4_delegation * search_for_delegation(stateid_t *stid);

static struct nfs4_delegation * find_delegation_stateid(struct inode *ino, stateid_t *stid);

static int check_for_locks(struct nfs4_file *filp, struct nfs4_stateowner *lowner);
@@ -3211,7 +3210,7 @@ __be32 nfs4_validate_stateid(stateid_t *stateid, bool has_session) 
		goto out;



	status = nfserr_expired;

	stp = search_for_stateid(stateid);

	stp = find_stateid(stateid, 0);

	if (!stp)

		goto out;

	status = nfserr_bad_stateid;
@@ -3349,7 +3348,7 @@ nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
		goto out;

	}



	stp = search_for_stateid(stateid);

	stp = find_stateid(stateid, 0);

	if (!stp) {

		ret = nfserr_bad_stateid;

		goto out;
@@ -3718,7 +3717,6 @@ lock_ownerstr_hashval(struct inode *inode, u32 cl_id, 


static struct list_head lock_ownerid_hashtbl[LOCK_HASH_SIZE];

static struct list_head	lock_ownerstr_hashtbl[LOCK_HASH_SIZE];

static struct list_head lockstateid_hashtbl[STATEID_HASH_SIZE];



static int

same_stateid(stateid_t *id_one, stateid_t *id_two)
@@ -3728,49 +3726,20 @@ same_stateid(stateid_t *id_one, stateid_t *id_two) 
	return id_one->si_fileid == id_two->si_fileid;

}



static struct nfs4_stateid *

find_stateid(stateid_t *stid, int flags)

static struct nfs4_stateid *find_stateid(stateid_t *t, int flags)

{

	struct nfs4_stateid *local;

	u32 st_id = stid->si_stateownerid;

	u32 f_id = stid->si_fileid;

	struct nfs4_stateid *s;

	unsigned int hashval;



	dprintk("NFSD: find_stateid flags 0x%x\n",flags);

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

			    (local->st_stateid.si_fileid == f_id))

				return local;

		}

	} 



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

			    (local->st_stateid.si_fileid == f_id))

				return local;

		}

	}

	hashval = stateid_hashval(t->si_stateownerid, t->si_fileid);

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

		if (!same_stateid(&s->st_stateid, t))

			continue;

		if (flags & LOCK_STATE && s->st_type != NFS4_LOCK_STID)

			return NULL;

}



static struct nfs4_stateid *

search_for_stateid(stateid_t *stid)

{

	struct nfs4_stateid *local;

	unsigned int hashval = stateid_hashval(stid->si_stateownerid, stid->si_fileid);



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

		if (same_stateid(&local->st_stateid, stid))

			return local;

	}



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

		if (same_stateid(&local->st_stateid, stid))

			return local;

		if (flags & OPEN_STATE && s->st_type != NFS4_OPEN_STID)

			return NULL;

		return s;

		}

	return NULL;

}
@@ -3920,7 +3889,7 @@ alloc_init_lock_stateid(struct nfs4_stateowner *sop, struct nfs4_file *fp, struc 
	INIT_LIST_HEAD(&stp->st_perfile);

	INIT_LIST_HEAD(&stp->st_perstateowner);

	INIT_LIST_HEAD(&stp->st_lockowners); /* not used */

	list_add(&stp->st_hash, &lockstateid_hashtbl[hashval]);

	list_add(&stp->st_hash, &stateid_hashtbl[hashval]);

	list_add(&stp->st_perfile, &fp->fi_stateids);

	list_add(&stp->st_perstateowner, &sop->so_stateids);

	stp->st_stateowner = sop;
@@ -4497,10 +4466,8 @@ nfs4_state_init(void) 
		INIT_LIST_HEAD(&open_ownerstr_hashtbl[i]);

		INIT_LIST_HEAD(&open_ownerid_hashtbl[i]);

	}

	for (i = 0; i < STATEID_HASH_SIZE; i++) {

	for (i = 0; i < STATEID_HASH_SIZE; i++)

		INIT_LIST_HEAD(&stateid_hashtbl[i]);

		INIT_LIST_HEAD(&lockstateid_hashtbl[i]);

	}

	for (i = 0; i < LOCK_HASH_SIZE; i++) {

		INIT_LIST_HEAD(&lock_ownerid_hashtbl[i]);

		INIT_LIST_HEAD(&lock_ownerstr_hashtbl[i]);