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

nfsd4: cleanup lock/stateowner initialization 



Share some common code, stop doing silly things like initializing a list
head immediately before adding it to a list, etc.

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

fs/nfsd/nfs4state.c

+52 −48
Original line number Diff line number Diff line
@@ -2215,51 +2215,61 @@ nfs4_free_stateowner(struct kref *kref) 
	kmem_cache_free(stateowner_slab, sop);

}



static inline struct nfs4_stateowner *

alloc_stateowner(struct xdr_netobj *owner)

static void init_nfs4_replay(struct nfs4_replay *rp)

{

	rp->rp_status = nfserr_serverfault;

	rp->rp_buflen = 0;

	rp->rp_buf = rp->rp_ibuf;

}



static inline struct nfs4_stateowner *alloc_stateowner(struct xdr_netobj *owner, struct nfs4_client *clp)

{

	struct nfs4_stateowner *sop;



	if ((sop = kmem_cache_alloc(stateowner_slab, GFP_KERNEL))) {

		if ((sop->so_owner.data = kmalloc(owner->len, GFP_KERNEL))) {

			memcpy(sop->so_owner.data, owner->data, owner->len);

			sop->so_owner.len = owner->len;

			kref_init(&sop->so_ref);

			return sop;

		} 

	sop = kmem_cache_alloc(stateowner_slab, GFP_KERNEL);

	if (!sop)

		return NULL;



	sop->so_owner.data = kmemdup(owner->data, owner->len, GFP_KERNEL);

	if (!sop->so_owner.data) {

		kmem_cache_free(stateowner_slab, sop);

	}

		return NULL;

	}

	sop->so_owner.len = owner->len;



static struct nfs4_stateowner *

alloc_init_open_stateowner(unsigned int strhashval, struct nfs4_client *clp, struct nfsd4_open *open) {

	struct nfs4_stateowner *sop;

	struct nfs4_replay *rp;

	unsigned int idhashval;



	if (!(sop = alloc_stateowner(&open->op_owner)))

		return NULL;

	idhashval = open_ownerid_hashval(current_ownerid);

	INIT_LIST_HEAD(&sop->so_idhash);

	INIT_LIST_HEAD(&sop->so_strhash);

	kref_init(&sop->so_ref);

	INIT_LIST_HEAD(&sop->so_perclient);

	INIT_LIST_HEAD(&sop->so_stateids);

	INIT_LIST_HEAD(&sop->so_perstateid);  /* not used */

	INIT_LIST_HEAD(&sop->so_perstateid);

	INIT_LIST_HEAD(&sop->so_close_lru);

	sop->so_id = current_ownerid++;

	sop->so_time = 0;

	sop->so_client = clp;

	init_nfs4_replay(&sop->so_replay);

	return sop;

}



static void hash_openowner(struct nfs4_stateowner *sop, struct nfs4_client *clp, unsigned int strhashval)

{

	unsigned int idhashval;



	idhashval = open_ownerid_hashval(sop->so_id);

	list_add(&sop->so_idhash, &open_ownerid_hashtbl[idhashval]);

	list_add(&sop->so_strhash, &open_ownerstr_hashtbl[strhashval]);

	list_add(&sop->so_perclient, &clp->cl_openowners);

}



static struct nfs4_stateowner *

alloc_init_open_stateowner(unsigned int strhashval, struct nfs4_client *clp, struct nfsd4_open *open) {

	struct nfs4_stateowner *sop;



	sop = alloc_stateowner(&open->op_owner, clp);

	if (!sop)

		return NULL;

	sop->so_is_open_owner = 1;

	sop->so_id = current_ownerid++;

	sop->so_client = clp;

	sop->so_seqid = open->op_seqid;

	sop->so_confirmed = 0;

	rp = &sop->so_replay;

	rp->rp_status = nfserr_serverfault;

	rp->rp_buflen = 0;

	rp->rp_buf = rp->rp_ibuf;

	hash_openowner(sop, clp, strhashval);

	return sop;

}
@@ -3902,6 +3912,16 @@ find_lockstateowner_str(struct inode *inode, clientid_t *clid, 
	return NULL;

}



static void hash_lockowner(struct nfs4_stateowner *sop, unsigned int strhashval, struct nfs4_client *clp, struct nfs4_stateid *open_stp)

{

	unsigned int idhashval;



	idhashval = lockownerid_hashval(sop->so_id);

	list_add(&sop->so_idhash, &lock_ownerid_hashtbl[idhashval]);

	list_add(&sop->so_strhash, &lock_ownerstr_hashtbl[strhashval]);

	list_add(&sop->so_perstateid, &open_stp->st_lockowners);

}



/*

 * Alloc a lock owner structure.

 * Called in nfsd4_lock - therefore, OPEN and OPEN_CONFIRM (if needed) has
@@ -3913,33 +3933,17 @@ find_lockstateowner_str(struct inode *inode, clientid_t *clid, 
static struct nfs4_stateowner *

alloc_init_lock_stateowner(unsigned int strhashval, struct nfs4_client *clp, struct nfs4_stateid *open_stp, struct nfsd4_lock *lock) {

	struct nfs4_stateowner *sop;

	struct nfs4_replay *rp;

	unsigned int idhashval;



	if (!(sop = alloc_stateowner(&lock->lk_new_owner)))

	sop = alloc_stateowner(&lock->lk_new_owner, clp);

	if (!sop)

		return NULL;

	idhashval = lockownerid_hashval(current_ownerid);

	INIT_LIST_HEAD(&sop->so_idhash);

	INIT_LIST_HEAD(&sop->so_strhash);

	INIT_LIST_HEAD(&sop->so_perclient);

	INIT_LIST_HEAD(&sop->so_stateids);

	INIT_LIST_HEAD(&sop->so_perstateid);

	INIT_LIST_HEAD(&sop->so_close_lru); /* not used */

	sop->so_time = 0;

	list_add(&sop->so_idhash, &lock_ownerid_hashtbl[idhashval]);

	list_add(&sop->so_strhash, &lock_ownerstr_hashtbl[strhashval]);

	list_add(&sop->so_perstateid, &open_stp->st_lockowners);

	sop->so_is_open_owner = 0;

	sop->so_id = current_ownerid++;

	sop->so_client = clp;

	/* It is the openowner seqid that will be incremented in encode in the

	 * case of new lockowners; so increment the lock seqid manually: */

	sop->so_seqid = lock->lk_new_lock_seqid + 1;

	sop->so_confirmed = 1;

	rp = &sop->so_replay;

	rp->rp_status = nfserr_serverfault;

	rp->rp_buflen = 0;

	rp->rp_buf = rp->rp_ibuf;

	hash_lockowner(sop, strhashval, clp, open_stp);

	return sop;

}