Commit 3d0fabd5 authored by Trond Myklebust's avatar Trond Myklebust Committed by J. Bruce Fields
Browse files

nfsd: Add reference counting to lock stateids 



Ensure that nfsd4_lock() references the lock stateid while it is
manipulating it. Not currently necessary, but will be once the
client_mutex is removed.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 1af71cc8

fs/nfsd/nfs4state.c

+12 −3
Original line number Diff line number Diff line
@@ -4729,6 +4729,7 @@ init_lock_stateid(struct nfs4_ol_stateid *stp, struct nfs4_lockowner *lo, 


	lockdep_assert_held(&clp->cl_lock);



	atomic_inc(&stp->st_stid.sc_count);

	stp->st_stid.sc_type = NFS4_LOCK_STID;

	stp->st_stateowner = &lo->lo_owner;

	get_nfs4_file(fp);
@@ -4753,9 +4754,11 @@ find_lock_stateid(struct nfs4_lockowner *lo, struct nfs4_file *fp) 
	lockdep_assert_held(&clp->cl_lock);



	list_for_each_entry(lst, &lo->lo_owner.so_stateids, st_perstateowner) {

		if (lst->st_stid.sc_file == fp)

		if (lst->st_stid.sc_file == fp) {

			atomic_inc(&lst->st_stid.sc_count);

			return lst;

		}

	}

	return NULL;

}
@@ -4856,7 +4859,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
{

	struct nfs4_openowner *open_sop = NULL;

	struct nfs4_lockowner *lock_sop = NULL;

	struct nfs4_ol_stateid *lock_stp;

	struct nfs4_ol_stateid *lock_stp = NULL;

	struct nfs4_file *fp;

	struct file *filp = NULL;

	struct file_lock *file_lock = NULL;
@@ -4910,11 +4913,15 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
			goto out;

		status = lookup_or_create_lock_state(cstate, open_stp, lock,

							&lock_stp, &new_state);

	} else

	} else {

		status = nfs4_preprocess_seqid_op(cstate,

				       lock->lk_old_lock_seqid,

				       &lock->lk_old_lock_stateid,

				       NFS4_LOCK_STID, &lock_stp, nn);

		/* FIXME: move into nfs4_preprocess_seqid_op */

		if (!status)

			atomic_inc(&lock_stp->st_stid.sc_count);

	}

	if (status)

		goto out;

	lock_sop = lockowner(lock_stp->st_stateowner);
@@ -5007,6 +5014,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
out:

	if (filp)

		fput(filp);

	if (lock_stp)

		nfs4_put_stid(&lock_stp->st_stid);

	if (status && new_state)

		release_lock_stateid(lock_stp);

	nfsd4_bump_seqid(cstate, status);