summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher2011-03-16 01:31:39 +0100
committerPhilipp Reisner2012-11-08 16:44:39 +0100
commit5b9f499c664efc1a72a0fe2538b39db7e75ecd2b (patch)
treeaf277f171c1ec8e9657d7142d0a2163d2a0685cd
parentdrbd: drbd_send_ack_ex(): Return 0 upon success and an error code otherwise (diff)
downloadkernel-qcow2-linux-5b9f499c664efc1a72a0fe2538b39db7e75ecd2b.tar.gz
kernel-qcow2-linux-5b9f499c664efc1a72a0fe2538b39db7e75ecd2b.tar.xz
kernel-qcow2-linux-5b9f499c664efc1a72a0fe2538b39db7e75ecd2b.zip
drbd: drbd_send_ov_request(): 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>
-rw-r--r--drivers/block/drbd/drbd_main.c4
-rw-r--r--drivers/block/drbd/drbd_worker.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 47771ab82579..200791e44aa2 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1342,15 +1342,13 @@ int drbd_send_drequest_csum(struct drbd_conf *mdev, sector_t sector, int size,
int drbd_send_ov_request(struct drbd_conf *mdev, sector_t sector, int size)
{
- int ok;
struct p_block_req p;
p.sector = cpu_to_be64(sector);
p.block_id = ID_SYNCER /* unused */;
p.blksize = cpu_to_be32(size);
- ok = !drbd_send_cmd(mdev, &mdev->tconn->data, P_OV_REQUEST, &p.head, sizeof(p));
- return ok;
+ return drbd_send_cmd(mdev, &mdev->tconn->data, P_OV_REQUEST, &p.head, sizeof(p));
}
/* called on sndtimeo
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 9b740864b51c..216479641a78 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -695,7 +695,7 @@ static int w_make_ov_request(struct drbd_work *w, int cancel)
size = (capacity-sector)<<9;
inc_rs_pending(mdev);
- if (!drbd_send_ov_request(mdev, sector, size)) {
+ if (drbd_send_ov_request(mdev, sector, size)) {
dec_rs_pending(mdev);
return 0;
}