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

Commit 76f6c9e1 authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

nfsd: Use lk_new_xxx instead of v.new.xxx for nfs4_lockowner 



Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent e7969315

fs/nfsd/nfs4state.c

+4 −4
Original line number Diff line number Diff line
@@ -5326,9 +5326,9 @@ lookup_or_create_lock_state(struct nfsd4_compound_state *cstate, 
	struct nfs4_lockowner *lo;

	unsigned int strhashval;



	lo = find_lockowner_str(&cl->cl_clientid, &lock->v.new.owner, cl);

	lo = find_lockowner_str(&cl->cl_clientid, &lock->lk_new_owner, cl);

	if (!lo) {

		strhashval = ownerstr_hashval(&lock->v.new.owner);

		strhashval = ownerstr_hashval(&lock->lk_new_owner);

		lo = alloc_init_lock_stateowner(strhashval, cl, ost, lock);

		if (lo == NULL)

			return nfserr_jukebox;
@@ -5389,7 +5389,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	if (lock->lk_is_new) {

		if (nfsd4_has_session(cstate))

			/* See rfc 5661 18.10.3: given clientid is ignored: */

			memcpy(&lock->v.new.clientid,

			memcpy(&lock->lk_new_clientid,

				&cstate->session->se_client->cl_clientid,

				sizeof(clientid_t));
@@ -5407,7 +5407,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
		open_sop = openowner(open_stp->st_stateowner);

		status = nfserr_bad_stateid;

		if (!same_clid(&open_sop->oo_owner.so_client->cl_clientid,

						&lock->v.new.clientid))

						&lock->lk_new_clientid))

			goto out;

		status = lookup_or_create_lock_state(cstate, open_stp, lock,

							&lock_stp, &new);