summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2013-07-23 12:53:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-23 14:24:59 -0700
commit4f3cc4809a98a165a9708b72b47de71643797bbd (patch)
treefa1db465f6c74786457d81343be9cdaa9f824921 /fs/nfs
parentb3a3a9c441e2c8f6b6760de9331023a7906a4ac6 (diff)
downloadop-kernel-dev-4f3cc4809a98a165a9708b72b47de71643797bbd.zip
op-kernel-dev-4f3cc4809a98a165a9708b72b47de71643797bbd.tar.gz
NFSv4: Fix brainfart in attribute length calculation
The calculation of the attribute length was 4 bytes off. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Tested-by: Andre Heider <a.heider@gmail.com> Reported-and-tested-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4xdr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index c74d616..3850b01 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -1118,11 +1118,11 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap,
len, ((char *)p - (char *)q) + 4);
BUG();
}
- len = (char *)p - (char *)q - (bmval_len << 2);
*q++ = htonl(bmval0);
*q++ = htonl(bmval1);
if (bmval_len == 3)
*q++ = htonl(bmval2);
+ len = (char *)p - (char *)(q + 1);
*q = htonl(len);
/* out: */
OpenPOWER on IntegriCloud