From 13186a6ec32681990df1f9ea8f3f5e0e462ddb03 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 16 Mar 2011 17:54:02 +0100 Subject: [PATCH] --- yaml --- r: 345926 b: refs/heads/master c: 28284ceff043b14defcf8122b765fe0b21bd9344 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 16c3f770873f..450107175216 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc5be8397fb79b70142e6d32e5d9d063c42c8756 +refs/heads/master: 28284ceff043b14defcf8122b765fe0b21bd9344 diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 929a268689c9..cca2da70276e 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -1426,7 +1426,7 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req, dev_warn(DEV, "short read receiving data reply digest: read %d expected %d\n", rr, dgs); - return 0; + return rr < 0 ? rr : -EIO; } } @@ -1450,7 +1450,7 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req, dev_warn(DEV, "short read receiving data reply: " "read %d expected %d\n", rr, expect); - return 0; + return rr < 0 ? rr : -EIO; } data_size -= rr; } @@ -1459,12 +1459,12 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req, drbd_csum_bio(mdev, mdev->tconn->integrity_r_tfm, bio, dig_vv); if (memcmp(dig_in, dig_vv, dgs)) { dev_err(DEV, "Digest integrity check FAILED. Broken NICs?\n"); - return 0; + return -EINVAL; } } D_ASSERT(data_size == 0); - return 1; + return 0; } /* e_end_resync_block() is called via @@ -1565,7 +1565,7 @@ static int receive_DataReply(struct drbd_conf *mdev, enum drbd_packet cmd, /* hlist_del(&req->collision) is done in _req_may_be_done, to avoid * special casing it there for the various failure cases. * still no race with drbd_fail_pending_reads */ - ok = recv_dless_read(mdev, req, sector, data_size); + ok = !recv_dless_read(mdev, req, sector, data_size); if (ok) req_mod(req, DATA_RECEIVED);