Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44109241 authored by Fred Isaman's avatar Fred Isaman Committed by Trond Myklebust
Browse files

nfs: fix printout of multiword bitfields 



Benny points out that zero-padding of multiword bitfields is necessary,
and that delimiting each word is nice to avoid endianess confusion.

bhalevy: without zero padding output can be ambiguous. Also,
since the printed array of two 32-bit unsigned integers is not a
64-bit number, delimiting the output with a semicolon makes more sense.

Signed-off-by: default avatarFred Isaman <iisaman@citi.umich.edu>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 856dff3d

fs/nfs/nfs4xdr.c

+5 −5
Original line number Diff line number Diff line
@@ -1191,8 +1191,8 @@ static int encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg 
		attrs[1] &= ~FATTR4_WORD1_MOUNTED_ON_FILEID;

	WRITE32(attrs[0] & readdir->bitmask[0]);

	WRITE32(attrs[1] & readdir->bitmask[1]);

	dprintk("%s: cookie = %Lu, verifier = 0x%x%x, bitmap = 0x%x%x\n",

			__FUNCTION__,

	dprintk("%s: cookie = %Lu, verifier = %08x:%08x, bitmap = %08x:%08x\n",

			__func__,

			(unsigned long long)readdir->cookie,

			((u32 *)readdir->verifier.data)[0],

			((u32 *)readdir->verifier.data)[1],
@@ -2291,7 +2291,7 @@ static int decode_attr_supported(struct xdr_stream *xdr, uint32_t *bitmap, uint3 
		bitmap[0] &= ~FATTR4_WORD0_SUPPORTED_ATTRS;

	} else

		bitmask[0] = bitmask[1] = 0;

	dprintk("%s: bitmask=0x%x%x\n", __FUNCTION__, bitmask[0], bitmask[1]);

	dprintk("%s: bitmask=%08x:%08x\n", __func__, bitmask[0], bitmask[1]);

	return 0;

}
@@ -3505,8 +3505,8 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n 
		return status;

	READ_BUF(8);

	COPYMEM(readdir->verifier.data, 8);

	dprintk("%s: verifier = 0x%x%x\n",

			__FUNCTION__,

	dprintk("%s: verifier = %08x:%08x\n",

			__func__,

			((u32 *)readdir->verifier.data)[0],

			((u32 *)readdir->verifier.data)[1]);