From c11fb61ddfd25ade4ac592b68ee7db0d7c77ba29 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 16 Mar 2011 01:31:39 +0100 Subject: [PATCH] --- yaml --- r: 345908 b: refs/heads/master c: fa79abd893f21f458c74af8bca015aa2ef7486a5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 8 ++++---- trunk/drivers/block/drbd/drbd_worker.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2b34944841a2..9e078a92cc40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9a9994dc70f388e91cf4bcc971843084f9af44f +refs/heads/master: fa79abd893f21f458c74af8bca015aa2ef7486a5 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 92b24d083956..47771ab82579 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -1299,10 +1299,10 @@ int drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd, int drbd_send_ack_ex(struct drbd_conf *mdev, enum drbd_packet cmd, sector_t sector, int blksize, u64 block_id) { - return !_drbd_send_ack(mdev, cmd, - cpu_to_be64(sector), - cpu_to_be32(blksize), - cpu_to_be64(block_id)); + return _drbd_send_ack(mdev, cmd, + cpu_to_be64(sector), + cpu_to_be32(blksize), + cpu_to_be64(block_id)); } int drbd_send_drequest(struct drbd_conf *mdev, int cmd, diff --git a/trunk/drivers/block/drbd/drbd_worker.c b/trunk/drivers/block/drbd/drbd_worker.c index 69db6de984c0..9b740864b51c 100644 --- a/trunk/drivers/block/drbd/drbd_worker.c +++ b/trunk/drivers/block/drbd/drbd_worker.c @@ -1163,8 +1163,8 @@ int w_e_end_ov_reply(struct drbd_work *w, int cancel) else ov_oos_print(mdev); - ok = drbd_send_ack_ex(mdev, P_OV_RESULT, sector, size, - eq ? ID_IN_SYNC : ID_OUT_OF_SYNC); + ok = !drbd_send_ack_ex(mdev, P_OV_RESULT, sector, size, + eq ? ID_IN_SYNC : ID_OUT_OF_SYNC); dec_unacked(mdev);