On Wed, Nov 4, 2015 at 5:07 PM, Andrew Elble <aweits@xxxxxxx> wrote: > When delegations are revoked: > > In the NFSv4 case, NFS4ERR_BAD_STATEID > In the NFSv4.1 case, NFS4ERR_DELEG_REVOKED > > Signed-off-by: Andrew Elble <aweits@xxxxxxx> > --- > fs/nfsd/nfs4state.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 66df2903ab8e..0f0634ca4158 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -5147,15 +5147,21 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, > if ((status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0))) > return status; > > - status = nfsd4_lookup_stateid(cstate, stateid, NFS4_DELEG_STID, &s, nn); > + status = nfsd4_lookup_stateid(cstate, stateid, > + NFS4_DELEG_STID|NFS4_REVOKED_DELEG_STID, > + &s, nn); > if (status) > goto out; > dp = delegstateid(s); > status = check_stateid_generation(stateid, &dp->dl_stid.sc_stateid, nfsd4_has_session(cstate)); > if (status) > goto put_stateid; > - > - destroy_delegation(dp); > + if (dp->dl_stid.sc_type == NFS4_DELEG_STID) > + destroy_delegation(dp); > + if (dp->dl_stid.sc_type == NFS4_REVOKED_DELEG_STID) > + status = nfserr_bad_stateid; > + if (cstate->minorversion) > + status = nfserr_deleg_revoked; Umm... If the client is sending delegreturn, then why not destroy the delegation? What is the point of forcing the client to send FREE_STATEID, when it is telling you that it is no longer caching any locks or associated state and is no longer interested in keeping the delegation? -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
