aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_receiver.c
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2010-10-06 05:46:55 -0400
committerPhilipp Reisner <philipp.reisner@linbit.com>2010-10-14 12:38:45 -0400
commit2b2bf2148fd46874ee72a877c951e5c6675d1caa (patch)
tree15ec40dd736c5e7cf833deb61b6770d562fa11b5 /drivers/block/drbd/drbd_receiver.c
parent004352fa60345e499379af310de73a2df1a5762a (diff)
drbd: drbd_send_ack_dp must not rely on header information
drbd commit 17c854fea474a5eb3cfa12e4fb019e46debbc4ec drbd: receiving of big packets, for payloads between 64kByte and 4GByte introduced a new on-the-wire packet header format. We must no longer assume either format, but use the result of whatever drbd_recv_header has decoded. 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index b5d3fa6c7a8b..45a2d610ca1d 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -1630,7 +1630,7 @@ static int receive_RSDataReply(struct drbd_conf *mdev, enum drbd_packets cmd, un
1630 1630
1631 ok = drbd_drain_block(mdev, data_size); 1631 ok = drbd_drain_block(mdev, data_size);
1632 1632
1633 drbd_send_ack_dp(mdev, P_NEG_ACK, p); 1633 drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
1634 } 1634 }
1635 1635
1636 atomic_add(data_size >> 9, &mdev->rs_sect_in); 1636 atomic_add(data_size >> 9, &mdev->rs_sect_in);
@@ -1787,7 +1787,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
1787 mdev->peer_seq++; 1787 mdev->peer_seq++;
1788 spin_unlock(&mdev->peer_seq_lock); 1788 spin_unlock(&mdev->peer_seq_lock);
1789 1789
1790 drbd_send_ack_dp(mdev, P_NEG_ACK, p); 1790 drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
1791 atomic_inc(&mdev->current_epoch->epoch_size); 1791 atomic_inc(&mdev->current_epoch->epoch_size);
1792 return drbd_drain_block(mdev, data_size); 1792 return drbd_drain_block(mdev, data_size);
1793 } 1793 }