On Mon, Jul 13, 2015 at 05:29:01PM +0800, Kinglong Mee wrote: > Layout is a state resource, nfsd should check it too. > > Signed-off-by: Kinglong Mee <kinglongmee@xxxxxxxxx> > --- > fs/nfsd/nfs4state.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 61dfb33..e0a4556 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -2241,6 +2241,7 @@ static bool client_has_state(struct nfs4_client *clp) > * Also note we should probably be using this in 4.0 case too. > */ > return !list_empty(&clp->cl_openowners) > + || !list_empty(&clp->cl_lo_states) > || !list_empty(&clp->cl_delegations) > || !list_empty(&clp->cl_sessions); > } > @@ -4257,8 +4258,9 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, > goto out; > clp = cstate->clp; > status = nfserr_cb_path_down; > - if (!list_empty(&clp->cl_delegations) > - && clp->cl_cb_state != NFSD4_CB_UP) > + if ((!list_empty(&clp->cl_delegations) > + || !list_empty(&clp->cl_lo_states)) nfsd4_renew is NFSv4.0 only, so I don't think this part is necessary. That said, it's harmless--why don't we just call client_has_state() here instead? --b. > + && clp->cl_cb_state != NFSD4_CB_UP) > goto out; > status = nfs_ok; > out: > -- > 2.4.3 -- 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
