On Wed, Apr 24, 2013 at 06:14:58PM -0400, Steve Dickson wrote:
> On 24/04/13 17:28, J. Bruce Fields wrote:
> >> @@ -3231,11 +3340,13 @@ nfsd4_encode_setattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4
> >> > WRITE32(2);
> >> > WRITE32(0);
> >> > WRITE32(0);
> >> > + WRITE32(0);
> > Note that "2" above is the length of the bitmap field that follows.
> >
> >> > }
> >> > else {
> >> > WRITE32(2);
> >> > WRITE32(setattr->sa_bmval[0]);
> >> > WRITE32(setattr->sa_bmval[1]);
> >> > + WRITE32(setattr->sa_bmval[2]);
> > Ditto.
> Right... I did miss that....
With that change the pynfs tests all pass this time.
--b.
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 75b5b6d..7bbc698 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3310,13 +3310,13 @@ nfsd4_encode_setattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4
RESERVE_SPACE(12);
if (nfserr) {
- WRITE32(2);
+ WRITE32(3);
WRITE32(0);
WRITE32(0);
WRITE32(0);
}
else {
- WRITE32(2);
+ WRITE32(3);
WRITE32(setattr->sa_bmval[0]);
WRITE32(setattr->sa_bmval[1]);
WRITE32(setattr->sa_bmval[2]);
--
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
