*
*/
-#define EXPORT_SYMTAB
-
#define DEBUG_SUBSYSTEM S_CLASS
+#include <linux/obd_support.h>
#include <linux/lustre_net.h>
int lustre_pack_msg(int count, int *lens, char **bufs, int *len,
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->opc = NTOH__u32(m->opc);
- m->xid = NTOH__u32(m->xid);
m->status = NTOH__u32(m->status);
m->type = NTOH__u32(m->type);
- m->connid = NTOH__u32(m->connid);
m->bufcount = NTOH__u32(m->bufcount);
- m->last_rcvd = NTOH__u64(m->last_rcvd);
+ m->last_xid = NTOH__u64(m->last_xid);
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);
{
int i, offset;
+ if (!m) {
+ CERROR("no message buffer!\n");
+ LBUG();
+ return NULL;
+ }
+
if (n < 0 || n >= m->bufcount) {
- CERROR("referencing bad sub buffer!\n");
+ CERROR("referencing bad sub buffer (want %d, count is %d)!\n",
+ n, m->bufcount);
LBUG();
return NULL;
}
- if (m->buflens[n] == 0)
+ if (m->buflens[n] == 0) {
+ CERROR("zero-length buffer requested for buffer %d\n", n);
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]);