Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 345927
b: refs/heads/master
c: e1c1b0f
h: refs/heads/master
i:
  345925: 3a29ddb
  345923: 1416df7
  345919: 9dc3f12
v: v3
  • Loading branch information
Andreas Gruenbacher authored and Philipp Reisner committed Nov 8, 2012
1 parent 13186a6 commit c3bdc8e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 28284ceff043b14defcf8122b765fe0b21bd9344
refs/heads/master: e1c1b0fc8fbda14fd4470ba3a24ce6abdc11436f
6 changes: 3 additions & 3 deletions trunk/drivers/block/drbd/drbd_receiver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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 *
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit c3bdc8e

Please sign in to comment.