On Wed, Mar 11, 2009 at 08:29:52PM +0200, Benny Halevy wrote: > On Mar. 11, 2009, 2:26 +0200, "J. Bruce Fields" <bfields@xxxxxxxxxxxx> wrote: > > From: J. Bruce Fields <bfields@xxxxxxxxxxxxxx> > > > > Previous cleanup reveals an obvious (though harmless) bug: when > > delegreturn gets a stateid that isn't for a delegation, it should return > > an error rather than doing nothing. > > > > Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx> > > --- > > fs/nfsd/nfs4state.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > > index de1d68a..4a92d1e 100644 > > --- a/fs/nfsd/nfs4state.c > > +++ b/fs/nfsd/nfs4state.c > > @@ -2418,7 +2418,7 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, > > status = nfserr_stale_stateid; > > if (STALE_STATEID(stateid)) > > goto out; > > - status = nfs_ok; > > + status = nfserr_bad_stateid; > > if (is_delegation_stateid(stateid)) > > goto out; > > status = nfserr_bad_stateid; > > This assignment is redundant now, isn't it? Yep, thanks.--b. -- 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
