diff options
| author | Benny Halevy <bhalevy@panasas.com> | 2009-08-14 17:19:18 +0300 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-08-14 13:16:00 -0400 |
| commit | 2220f13a8b90d2259f3094cb54cf4de67d8eee2d (patch) | |
| tree | ab7aa286938009cda8fcaf06ad924eff23fae2fc /fs | |
| parent | 42edd698125b76a38bd9999015202db036dfbc76 (diff) | |
| download | linux-stable-2220f13a8b90d2259f3094cb54cf4de67d8eee2d.tar.gz linux-stable-2220f13a8b90d2259f3094cb54cf4de67d8eee2d.tar.bz2 linux-stable-2220f13a8b90d2259f3094cb54cf4de67d8eee2d.zip | |
nfs: nfs4xdr: encode_compound_hdr does not have to round up reserved bytes
This is already done by xdr_reserve_space and since encode_compound_hdr
is adding a byte count to "12" which is already word aligned, the xdr
level rounding will work just as well.
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index d460d81758ae..7c2b162dd845 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -740,7 +740,7 @@ static void encode_compound_hdr(struct xdr_stream *xdr, dprintk("encode_compound: tag=%.*s\n", (int)hdr->taglen, hdr->tag); BUG_ON(hdr->taglen > NFS4_MAXTAGLEN); - RESERVE_SPACE(12+(XDR_QUADLEN(hdr->taglen)<<2)); + RESERVE_SPACE(12 + hdr->taglen); *p++ = cpu_to_be32(hdr->taglen); p = xdr_encode_opaque_fixed(p, hdr->tag, hdr->taglen); *p++ = cpu_to_be32(hdr->minorversion); |