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

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

nfsd: nfsd4_process_open2() must reference the open stateid 



Ensure that nfsd4_process_open2() keeps a reference to the open
stateid until it is done working with it. Necessary step toward
client_mutex removal.

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

fs/nfsd/nfs4state.c

+4 −0
Original line number Diff line number Diff line
@@ -2996,6 +2996,7 @@ alloc_init_open_stateowner(unsigned int strhashval, struct nfsd4_open *open, 
static void init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp, struct nfsd4_open *open) {

	struct nfs4_openowner *oo = open->op_openowner;



	atomic_inc(&stp->st_stid.sc_count);

	stp->st_stid.sc_type = NFS4_OPEN_STID;

	INIT_LIST_HEAD(&stp->st_locks);

	stp->st_stateowner = &oo->oo_owner;
@@ -3376,6 +3377,7 @@ nfsd4_find_existing_open(struct nfs4_file *fp, struct nfsd4_open *open) 
			continue;

		if (local->st_stateowner == &oo->oo_owner) {

			ret = local;

			atomic_inc(&ret->st_stid.sc_count);

			break;

		}

	}
@@ -3836,6 +3838,8 @@ out: 
		open->op_rflags |= NFS4_OPEN_RESULT_CONFIRM;

	if (dp)

		nfs4_put_stid(&dp->dl_stid);

	if (stp)

		nfs4_put_stid(&stp->st_stid);



	return status;

}