for (i = 0; i < count; i++)
size += size_round(lens[i]);
- *len = sizeof(*m) + count * sizeof(__u32) + size;
+ *len = size_round(sizeof(*m) + count * sizeof(__u32)) + size;
OBD_ALLOC(*msg, *len);
if (!*msg)
for (i = 0; i < count; i++)
m->buflens[i] = HTON__u32(lens[i]);
- ptr = (char *)m + sizeof(*m) + sizeof(__u32) * count;
+ ptr = (char *)m + size_round(sizeof(*m) + count * sizeof(__u32));
for (i = 0; i < count; i++) {
char *tmp = NULL;
if (bufs)
* with the given sub-buffer lengths. */
int lustre_msg_size(int count, int *lengths)
{
- int size = sizeof(struct lustre_msg), i;
+ int size = 0, i;
for (i = 0; i < count; i++)
size += size_round(lengths[i]);
- size += count * sizeof(__u32);
+ size += size_round(sizeof(struct lustre_msg) + count * sizeof(__u32));
return size;
}
{
int required_len, i;
- required_len = sizeof(*m);
+ required_len = size_round(sizeof(*m));
if (len < required_len)
RETURN(-EINVAL);
m->last_rcvd = NTOH__u64(m->last_rcvd);
m->last_committed = NTOH__u64(m->last_committed);
- required_len += m->bufcount * sizeof(__u32);
+ required_len = size_round(sizeof(*m) + m->bufcount * sizeof(__u32));
if (len < required_len)
RETURN(-EINVAL);
if (m->buflens[n] == 0)
return NULL;
- offset = sizeof(*m) + m->bufcount * sizeof(__u32);
+ offset = size_round(sizeof(*m) + m->bufcount * sizeof(__u32));
for (i = 0; i < n; i++)
offset += size_round(m->buflens[i]);