From 9705b117e07f6766013cc4e695fd14d1600ad892 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 16 Mar 2011 10:49:09 +0100 Subject: [PATCH] --- yaml --- r: 345915 b: refs/heads/master c: 9f69230cd6e8dc87bf6b55e46c51418a2b6ac322 h: refs/heads/master i: 345913: 956d600ed0dff33a0b258606c1fe9266f0ecb83e 345911: 8a64662e9848339565f49b74513e343b3e501bd2 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9ff08129bacc..062a576889c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88b390ff639ce5d9a1e741bb2f975e932d5cb605 +refs/heads/master: 9f69230cd6e8dc87bf6b55e46c51418a2b6ac322 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index fa838b24eedf..59fb39f15a11 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -1500,16 +1500,19 @@ static int _drbd_send_zc_ee(struct drbd_conf *mdev, { struct page *page = peer_req->pages; unsigned len = peer_req->i.size; + int err; /* hint all but last page with MSG_MORE */ page_chain_for_each(page) { unsigned l = min_t(unsigned, len, PAGE_SIZE); - if (_drbd_send_page(mdev, page, 0, l, - page_chain_next(page) ? MSG_MORE : 0)) - return 0; + + err = _drbd_send_page(mdev, page, 0, l, + page_chain_next(page) ? MSG_MORE : 0); + if (err) + return err; len -= l; } - return 1; + return 0; } static u32 bio_flags_to_wire(struct drbd_conf *mdev, unsigned long bi_rw) @@ -1634,7 +1637,7 @@ int drbd_send_block(struct drbd_conf *mdev, enum drbd_packet cmd, ok = dgs == drbd_send(mdev->tconn, mdev->tconn->data.socket, dgb, dgs, 0); } if (ok) - ok = _drbd_send_zc_ee(mdev, peer_req); + ok = !_drbd_send_zc_ee(mdev, peer_req); drbd_put_data_sock(mdev->tconn);