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>

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index d460d81758ae948b397736c0ea02fdad294236c2..7c2b162dd84520d0d7d5159ffc9d2307222faaa9 100644 (file)
--- 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);