drbd: drbd_send_ack_ex(): 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>

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 92b24d083956e4076a6b2632907ec6480e067815..47771ab82579653359b45f955165f66c898ba365 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/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/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 69db6de984c0aea2ef461b50d96574256ce50341..9b740864b51c8a20e475e223f37cff925d69b990 100644 (file)
--- a/drivers/block/drbd/drbd_worker.c
+++ b/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);