drbd: drbd_send_ack_ex(): Return 0 upon success and an error code otherwise
authorAndreas Gruenbacher <agruen@linbit.com>
Wed, 16 Mar 2011 00:31:39 +0000 (01:31 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 8 Nov 2012 15:44:38 +0000 (16:44 +0100)
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_main.c
drivers/block/drbd/drbd_worker.c

index 92b24d0..47771ab 100644 (file)
@@ -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,
index 69db6de..9b74086 100644 (file)
@@ -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);