From c3bdc8e06696ead27f5d96e0102a4f8f881e9bce Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 16 Mar 2011 17:58:27 +0100 Subject: [PATCH] --- yaml --- r: 345927 b: refs/heads/master c: e1c1b0fc8fbda14fd4470ba3a24ce6abdc11436f h: refs/heads/master i: 345925: 3a29ddbb42acea3131ac02d07d9d390221af233d 345923: 1416df7d01eb19e8d92d177b2840cc1e1732b34a 345919: 9dc3f127e66572f6d9576ba2c5064d716d7b7d33 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 450107175216..77bb3f246bb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28284ceff043b14defcf8122b765fe0b21bd9344 +refs/heads/master: e1c1b0fc8fbda14fd4470ba3a24ce6abdc11436f diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index cca2da70276e..28980145b92c 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -1515,7 +1515,7 @@ static int recv_resync_read(struct drbd_conf *mdev, sector_t sector, int data_si atomic_add(data_size >> 9, &mdev->rs_sect_ev); if (drbd_submit_peer_request(mdev, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0) - return true; + return 0; /* don't care for the reason here */ dev_err(DEV, "submit failed, triggering re-connect\n"); @@ -1526,7 +1526,7 @@ static int recv_resync_read(struct drbd_conf *mdev, sector_t sector, int data_si drbd_free_ee(mdev, peer_req); fail: put_ldev(mdev); - return false; + return -EIO; } static struct drbd_request * @@ -1590,7 +1590,7 @@ static int receive_RSDataReply(struct drbd_conf *mdev, enum drbd_packet cmd, /* data is submitted to disk within recv_resync_read. * corresponding put_ldev done below on error, * or in drbd_peer_request_endio. */ - ok = recv_resync_read(mdev, sector, data_size); + ok = !recv_resync_read(mdev, sector, data_size); } else { if (__ratelimit(&drbd_ratelimit_state)) dev_err(DEV, "Can not write resync data to local disk.\n");