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

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

nfsd4: simplify lock openmode check 



Note that the special handling for the lock stateid case is already done
by nfs4_check_openmode() (as of 02921914
"nfsd4: fix openmode checking on IO using lock stateid") so we no longer
need these two cases in the caller.

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

fs/nfsd/nfs4state.c

+5 −10
Original line number Diff line number Diff line
@@ -3453,16 +3453,11 @@ nfs4_preprocess_seqid_op(struct nfsd4_compound_state *cstate, u32 seqid, 
			if (!nfsd4_has_session(cstate) &&

			    !same_clid(&clp->cl_clientid, lockclid))

				return nfserr_bad_stateid;

		}

		/* stp is the open stateid */

		status = nfs4_check_openmode(stp, lkflg);

		if (status)

			return status;

		} else {

			/* stp is the lock stateid */

			status = nfs4_check_openmode(stp->st_openstp, lkflg);

			if (status)

				return status;

               }

	}



	if (nfs4_check_fh(current_fh, stp)) {