diff options
| author | Andreas Gruenbacher | 2011-03-16 10:49:09 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:44:41 +0100 |
| commit | 9f69230cd6e8dc87bf6b55e46c51418a2b6ac322 (patch) | |
| tree | af46273cf0d6e84f6912c9545d0ef076a7df031b /drivers/block/drbd/drbd_main.c | |
| parent | drbd: _drbd_send_page(): Return 0 upon success and an error code otherwise (diff) | |
| download | kernel-qcow2-linux-9f69230cd6e8dc87bf6b55e46c51418a2b6ac322.tar.gz kernel-qcow2-linux-9f69230cd6e8dc87bf6b55e46c51418a2b6ac322.tar.xz kernel-qcow2-linux-9f69230cd6e8dc87bf6b55e46c51418a2b6ac322.zip | |
drbd: _drbd_send_zc_ee(): Return 0 upon success and an error code otherwise
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_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index fa838b24eedf..59fb39f15a11 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/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); |