From 285bbb91dc72dd7db18dc03affb56eeef024ab2e Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 16 Mar 2011 01:31:39 +0100 Subject: [PATCH] --- yaml --- r: 345909 b: refs/heads/master c: 5b9f499c664efc1a72a0fe2538b39db7e75ecd2b h: refs/heads/master i: 345907: 548c355bb150a909dc393523927696121a807316 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 4 +--- trunk/drivers/block/drbd/drbd_worker.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9e078a92cc40..16ef0cd4866a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa79abd893f21f458c74af8bca015aa2ef7486a5 +refs/heads/master: 5b9f499c664efc1a72a0fe2538b39db7e75ecd2b diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 47771ab82579..200791e44aa2 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/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/trunk/drivers/block/drbd/drbd_worker.c b/trunk/drivers/block/drbd/drbd_worker.c index 9b740864b51c..216479641a78 100644 --- a/trunk/drivers/block/drbd/drbd_worker.c +++ b/trunk/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; }