diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-05-21 11:49:16 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-05-21 11:49:16 +1000 |
| commit | 26e1486db7cafa86d9deceb225820631dfeb2a92 (patch) | |
| tree | c58301360350c1fa609cba5c8cbb3f2662c8e889 /ctdb/ib/ibw_ctdb.c | |
| parent | 2fcedf6dac9dd275adbb0017e53547614df29d93 (diff) | |
| download | samba-26e1486db7cafa86d9deceb225820631dfeb2a92.tar.gz samba-26e1486db7cafa86d9deceb225820631dfeb2a92.tar.xz samba-26e1486db7cafa86d9deceb225820631dfeb2a92.zip | |
Whitespace changes and using the CTDB_NO_MEMORY() macro changes to
the previous patch.
(This used to be ctdb commit d623ea7c04daa6349b42d50862843c9f86115488)
Diffstat (limited to 'ctdb/ib/ibw_ctdb.c')
| -rw-r--r-- | ctdb/ib/ibw_ctdb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ctdb/ib/ibw_ctdb.c b/ctdb/ib/ibw_ctdb.c index 05541ada810..78d960a458a 100644 --- a/ctdb/ib/ibw_ctdb.c +++ b/ctdb/ib/ibw_ctdb.c @@ -166,7 +166,8 @@ int ctdb_ibw_receive_handler(struct ibw_conn *conn, void *buf, int n) * and being reused for next receive * noticed that HL requires talloc-ed memory to be stolen */ buf2 = talloc_zero_size(conn, n); - if (buf2 == NULL) return -1; + CTDB_NO_MEMORY(ctdb, buf2); + memcpy(buf2, buf, n); ctdb->upcalls->recv_pkt(ctdb, (uint8_t *)buf2, (uint32_t)n); |