diff options
| author | Andreas Gruenbacher | 2011-03-30 11:38:49 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:45:08 +0100 |
| commit | 52b061a44021ca11ee2fd238040e91341ff8066d (patch) | |
| tree | 6d307858219500a1e7b56eac42f1ffffa1b8d1b3 /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: Introduce new primitives for sending commands (diff) | |
| download | kernel-qcow2-linux-52b061a44021ca11ee2fd238040e91341ff8066d.tar.gz kernel-qcow2-linux-52b061a44021ca11ee2fd238040e91341ff8066d.tar.xz kernel-qcow2-linux-52b061a44021ca11ee2fd238040e91341ff8066d.zip | |
drbd: Introduce drbd_header_size()
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 61104dbb0172..e52a929d9ed3 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -995,7 +995,7 @@ static int drbd_recv_header(struct drbd_tconn *tconn, struct packet_info *pi) struct p_header *h = tconn->data.rbuf; int err; - err = drbd_recv_all_warn(tconn, h, sizeof(*h)); + err = drbd_recv_all_warn(tconn, h, drbd_header_size(tconn)); if (err) return err; @@ -4842,7 +4842,8 @@ int drbd_asender(struct drbd_thread *thi) int rv; void *buf = h; int received = 0; - int expect = sizeof(struct p_header); + unsigned int header_size = drbd_header_size(tconn); + int expect = header_size; int ping_timeout_active = 0; current->policy = SCHED_RR; /* Make this a realtime task! */ @@ -4926,7 +4927,7 @@ int drbd_asender(struct drbd_thread *thi) goto disconnect; } expect = cmd->pkt_size; - if (pi.size != expect - sizeof(struct p_header)) { + if (pi.size != expect - header_size) { conn_err(tconn, "Wrong packet size on meta (c: %d, l: %d)\n", pi.cmd, pi.size); goto reconnect; @@ -4950,7 +4951,7 @@ int drbd_asender(struct drbd_thread *thi) buf = h; received = 0; - expect = sizeof(struct p_header); + expect = header_size; cmd = NULL; } } |