On Tue, Jun 16, 2009 at 04:19:23AM +0300, Benny Halevy wrote: > From: Andy Adamson <andros@xxxxxxxxxx> > > In preparation for switching clientid cache strategies. > If cstate->slot is not set, nfsdsvc_encode_compoundres will not cache > the create session response. This is a regression. If you can't find a way to replace the reply cache without a temporary regression, a comment here to that affect would be helpful. I guess I can live with this (reluctantly) for code in this early a state. --b. > > Signed-off-by: Andy Adamson <andros@xxxxxxxxxx> > Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx> > --- > fs/nfsd/nfs4state.c | 7 ------- > 1 files changed, 0 insertions(+), 7 deletions(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index c22ec9b..5fdef66 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -1344,7 +1344,6 @@ nfsd4_create_session(struct svc_rqst *rqstp, > struct nfsd4_create_session *cr_ses) > { > u32 ip_addr = svc_addr_in(rqstp)->sin_addr.s_addr; > - struct nfsd4_compoundres *resp = rqstp->rq_resp; > struct nfs4_client *conf, *unconf; > struct nfsd4_slot *slot = NULL; > int status = 0; > @@ -1360,11 +1359,6 @@ nfsd4_create_session(struct svc_rqst *rqstp, > if (status == nfserr_replay_cache) { > dprintk("Got a create_session replay! seqid= %d\n", > slot->sl_seqid); > - cstate->slot = slot; > - cstate->status = status; > - /* Return the cached reply status */ > - status = nfsd4_replay_cache_entry(resp, NULL); > - goto out; > } else if (cr_ses->seqid != conf->cl_slot.sl_seqid + 1) { > status = nfserr_seq_misordered; > dprintk("Sequence misordered!\n"); > @@ -1413,7 +1407,6 @@ nfsd4_create_session(struct svc_rqst *rqstp, > cr_ses->seqid = slot->sl_seqid; > > slot->sl_inuse = true; > - cstate->slot = slot; > /* Ensure a page is used for the cache */ > slot->sl_cache_entry.ce_cachethis = 1; > out: > -- > 1.6.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