|
@@ -4465,13 +4465,11 @@ nfs4_preprocess_stateid_op(struct net *net, struct nfsd4_compound_state *cstate,
|
|
|
if (ZERO_STATEID(stateid) || ONE_STATEID(stateid))
|
|
|
return check_special_stateids(net, current_fh, stateid, flags);
|
|
|
|
|
|
- nfs4_lock_state();
|
|
|
-
|
|
|
status = nfsd4_lookup_stateid(cstate, stateid,
|
|
|
NFS4_DELEG_STID|NFS4_OPEN_STID|NFS4_LOCK_STID,
|
|
|
&s, nn);
|
|
|
if (status)
|
|
|
- goto unlock_state;
|
|
|
+ return status;
|
|
|
status = check_stateid_generation(stateid, &s->sc_stateid, nfsd4_has_session(cstate));
|
|
|
if (status)
|
|
|
goto out;
|
|
@@ -4521,8 +4519,6 @@ nfs4_preprocess_stateid_op(struct net *net, struct nfsd4_compound_state *cstate,
|
|
|
*filpp = file;
|
|
|
out:
|
|
|
nfs4_put_stid(s);
|
|
|
-unlock_state:
|
|
|
- nfs4_unlock_state();
|
|
|
return status;
|
|
|
}
|
|
|
|