From: Matthew Dillon Date: Fri, 15 Jun 2012 03:00:00 +0000 (-0700) Subject: hammer2 - minor network adjustments X-Git-Tag: v3.4.0rc~1067 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/f2e07ffbc7c8be4479269fb1b22170601fe04336 hammer2 - minor network adjustments * Adjust HAMMER2_MSG_HDR_ENCODE to cast sizeof() to uint32_t so the encodde command's integer type matches the uint32_t the message header expects. --- diff --git a/sys/vfs/hammer2/hammer2_network.h b/sys/vfs/hammer2/hammer2_network.h index 4a79da6124..6558746478 100644 --- a/sys/vfs/hammer2/hammer2_network.h +++ b/sys/vfs/hammer2/hammer2_network.h @@ -225,6 +225,9 @@ typedef struct hammer2_msg_hdr hammer2_msg_hdr_t; HAMMER2_MSGF_SIZE | \ HAMMER2_MSGF_PROTOS | \ HAMMER2_MSGF_REPLY) +#define HAMMER2_MSGF_BASECMDMASK (HAMMER2_MSGF_CMDS | \ + HAMMER2_MSGF_SIZE | \ + HAMMER2_MSGF_PROTOS) #define HAMMER2_MSG_PROTO_LNK 0x00000000U #define HAMMER2_MSG_PROTO_DBG 0x00100000U @@ -241,7 +244,7 @@ typedef struct hammer2_msg_hdr hammer2_msg_hdr_t; #define HAMMER2_MSG_ALIGNMASK (HAMMER2_MSG_ALIGN - 1) #define HAMMER2_MSG_DOALIGN(bytes) (((bytes) + HAMMER2_MSG_ALIGNMASK) & \ ~HAMMER2_MSG_ALIGNMASK) -#define HAMMER2_MSG_HDR_ENCODE(elm) ((sizeof(struct elm) + \ +#define HAMMER2_MSG_HDR_ENCODE(elm) (((uint32_t)sizeof(struct elm) + \ HAMMER2_MSG_ALIGNMASK) / \ HAMMER2_MSG_ALIGN)