drbd: drbd_send_drequest(): 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 200791e44aa257c6c065c5dbd65b8ba75ec63ae5..34062e37df65942a6b1e88553434caa0255fcf14 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1308,15 +1308,13 @@ int drbd_send_ack_ex(struct drbd_conf *mdev, enum drbd_packet cmd,
 int drbd_send_drequest(struct drbd_conf *mdev, int cmd,
                       sector_t sector, int size, u64 block_id)
 {
-       int ok;
        struct p_block_req p;
 
        p.sector   = cpu_to_be64(sector);
        p.block_id = block_id;
        p.blksize  = cpu_to_be32(size);
 
-       ok = !drbd_send_cmd(mdev, &mdev->tconn->data, cmd, &p.head, sizeof(p));
-       return ok;
+       return drbd_send_cmd(mdev, &mdev->tconn->data, cmd, &p.head, sizeof(p));
 }
 
 int drbd_send_drequest_csum(struct drbd_conf *mdev, sector_t sector, int size,

diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 216479641a787ecc6343acc490be7199d3a090d6..3c785657040b8c94584e58584ef48b246d3606df 100644 (file)
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -637,7 +637,7 @@ next_sector:
                        }
                } else {
                        inc_rs_pending(mdev);
-                       if (!drbd_send_drequest(mdev, P_RS_DATA_REQUEST,
+                       if (drbd_send_drequest(mdev, P_RS_DATA_REQUEST,
                                               sector, size, ID_SYNCER)) {
                                dev_err(DEV, "drbd_send_drequest() failed, aborting...\n");
                                dec_rs_pending(mdev);
@@ -1287,8 +1287,8 @@ int w_send_read_req(struct drbd_work *w, int cancel)
                return 1;
        }
 
-       ok = drbd_send_drequest(mdev, P_DATA_REQUEST, req->i.sector, req->i.size,
-                               (unsigned long)req);
+       ok = !drbd_send_drequest(mdev, P_DATA_REQUEST, req->i.sector, req->i.size,
+                                (unsigned long)req);
 
        req_mod(req, ok ? HANDED_OVER_TO_NETWORK : SEND_FAILED);