diff options
| author | Andreas Gruenbacher | 2011-03-16 01:31:39 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:44:38 +0100 |
| commit | fa79abd893f21f458c74af8bca015aa2ef7486a5 (patch) | |
| tree | 3861f6ad2d31ee561ad5a4fd303db082b2cf63e6 | |
| parent | drbd: drbd_send_ack_{dp,rp}(): Return void: the result is never used (diff) | |
| download | kernel-qcow2-linux-fa79abd893f21f458c74af8bca015aa2ef7486a5.tar.gz kernel-qcow2-linux-fa79abd893f21f458c74af8bca015aa2ef7486a5.tar.xz kernel-qcow2-linux-fa79abd893f21f458c74af8bca015aa2ef7486a5.zip | |
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>
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 8 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 92b24d083956..47771ab82579 100644 --- 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 69db6de984c0..9b740864b51c 100644 --- 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); |