summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-08-31 15:39:30 -0400
committerJ. Bruce Fields <bfields@redhat.com>2011-08-31 17:55:57 -0400
commitb7d7ca35807b4c8ca3271885b47e67c843376f77 (patch)
tree6e8c3d0542d7b023a622e73695cc922dc6bd1b5d
parentc152292f9ee7eb4ed30edc0bd5027a5beef5f5e8 (diff)
downloadop-kernel-dev-b7d7ca35807b4c8ca3271885b47e67c843376f77.zip
op-kernel-dev-b7d7ca35807b4c8ca3271885b47e67c843376f77.tar.gz
nfsd4: fix off-by-one-error in SEQUENCE reply
The values here represent highest slotid numbers. Since slotid's are numbered starting from zero, the highest should be one less than the number of slots. Reported-by: Rick Macklem <rmacklem@uoguelph.ca> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/nfs4xdr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 04ad9a2..f982d85 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3221,9 +3221,9 @@ nfsd4_encode_sequence(struct nfsd4_compoundres *resp, int nfserr,
WRITEMEM(seq->sessionid.data, NFS4_MAX_SESSIONID_LEN);
WRITE32(seq->seqid);
WRITE32(seq->slotid);
- WRITE32(seq->maxslots);
- /* For now: target_maxslots = maxslots */
- WRITE32(seq->maxslots);
+ /* Note slotid's are numbered from zero: */
+ WRITE32(seq->maxslots - 1); /* sr_highest_slotid */
+ WRITE32(seq->maxslots - 1); /* sr_target_highest_slotid */
WRITE32(seq->status_flags);
ADJUST_ARGS();
OpenPOWER on IntegriCloud