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

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

nfsd: Always use lookup_clientid() in nfsd4_process_open1 



In later patches, we'll be moving the stateowner table into the
nfs4_client, and by doing this we ensure that we have a cached
nfs4_client pointer.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 13d6f66b

fs/nfsd/nfs4state.c

+5 −6
Original line number Diff line number Diff line
@@ -3050,19 +3050,19 @@ nfsd4_process_open1(struct nfsd4_compound_state *cstate, 
	if (open->op_file == NULL)

		return nfserr_jukebox;



	strhashval = ownerstr_hashval(clientid->cl_id, &open->op_owner);

	oo = find_openstateowner_str(strhashval, open, cstate->minorversion, nn);

	open->op_openowner = oo;

	if (!oo) {

	status = lookup_clientid(clientid, cstate, nn);

	if (status)

		return status;

	clp = cstate->clp;



	strhashval = ownerstr_hashval(clientid->cl_id, &open->op_owner);

	oo = find_openstateowner_str(strhashval, open, cstate->minorversion, nn);

	open->op_openowner = oo;

	if (!oo) {

		goto new_owner;

	}

	if (!(oo->oo_flags & NFS4_OO_CONFIRMED)) {

		/* Replace unconfirmed owners without checking for replay. */

		clp = oo->oo_owner.so_client;

		release_openowner(oo);

		open->op_openowner = NULL;

		goto new_owner;
@@ -3070,7 +3070,6 @@ nfsd4_process_open1(struct nfsd4_compound_state *cstate, 
	status = nfsd4_check_seqid(cstate, &oo->oo_owner, open->op_seqid);

	if (status)

		return status;

	clp = oo->oo_owner.so_client;

	goto alloc_stateid;

new_owner:

	oo = alloc_init_open_stateowner(strhashval, open, cstate);