diff options
| author |   Andy Adamson <andros@netapp.com> | 2009-08-28 08:45:02 -0400 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@citi.umich.edu> | 2009-09-01 22:24:05 -0400 |
| commit | a8dfdaeb7a8b1295f45d9d208dd27e6e20113d1b (patch) | |
| tree | fd7bdabd4f66ee054fc2b2e2d6b39089d5a5b972 /fs/nfsd/nfs4state.c | |
| parent | nfsd41: bound forechannel drc size by memory usage (diff) | |
| download | linux-dev-a8dfdaeb7a8b1295f45d9d208dd27e6e20113d1b.tar.xz linux-dev-a8dfdaeb7a8b1295f45d9d208dd27e6e20113d1b.zip | |
nfsd41: use session maxreqs for sequence target and highest slotid
This fixes a bug in the sequence operation reply.
The sequence operation returns the highest slotid it will accept in the future
in sr_highest_slotid, and the highest slotid it prefers the client to use.
Since we do not re-negotiate the session slot table yet, these should both
always be set to the session ca_maxrequests.
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 02b3ddd0bee3..ec074e7959f5 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1133,7 +1133,6 @@ nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp, * session inactivity timer fires and a solo sequence operation * is sent (lease renewal). */ - seq->maxslots = resp->cstate.session->se_fchannel.maxreqs; /* Either returns 0 or nfserr_retry_uncached */ status = nfsd4_enc_sequence_replay(resp->rqstp->rq_argp, resp); @@ -1497,6 +1496,11 @@ nfsd4_sequence(struct svc_rqst *rqstp, slot = &session->se_slots[seq->slotid]; dprintk("%s: slotid %d\n", __func__, seq->slotid); + /* We do not negotiate the number of slots yet, so set the + * maxslots to the session maxreqs which is used to encode + * sr_highest_slotid and the sr_target_slot id to maxslots */ + seq->maxslots = session->se_fchannel.maxreqs; + status = check_slot_seqid(seq->seqid, slot->sl_seqid, slot->sl_inuse); if (status == nfserr_replay_cache) { cstate->slot = slot; |