drbd: drbd_send_drequest_csum(): 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 34062e37df65942a6b1e88553434caa0255fcf14..779bf5b10d5a98a1b1f98b9c728ff3e5c111815f 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1320,7 +1320,7 @@ int drbd_send_drequest(struct drbd_conf *mdev, int cmd,
 int drbd_send_drequest_csum(struct drbd_conf *mdev, sector_t sector, int size,
                            void *digest, int digest_size, enum drbd_packet cmd)
 {
-       int ok;
+       int err;
        struct p_block_req p;
 
        prepare_header(mdev, &p.head, cmd, sizeof(p) - sizeof(struct p_header) + digest_size);
@@ -1329,13 +1329,11 @@ int drbd_send_drequest_csum(struct drbd_conf *mdev, sector_t sector, int size,
        p.blksize  = cpu_to_be32(size);
 
        mutex_lock(&mdev->tconn->data.mutex);
-
-       ok = (sizeof(p) == drbd_send(mdev->tconn, mdev->tconn->data.socket, &p, sizeof(p), 0));
-       ok = ok && (digest_size == drbd_send(mdev->tconn, mdev->tconn->data.socket, digest, digest_size, 0));
-
+       err = drbd_send_all(mdev->tconn, mdev->tconn->data.socket, &p, sizeof(p), 0);
+       if (!err)
+               err = drbd_send_all(mdev->tconn, mdev->tconn->data.socket, digest, digest_size, 0);
        mutex_unlock(&mdev->tconn->data.mutex);
-
-       return ok;
+       return err;
 }
 
 int drbd_send_ov_request(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 3c785657040b8c94584e58584ef48b246d3606df..a529ffe213a6bb2c9af51129cdc48cd280245017 100644 (file)
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -324,9 +324,9 @@ static int w_e_send_csum(struct drbd_work *w, int cancel)
                drbd_free_ee(mdev, peer_req);
                peer_req = NULL;
                inc_rs_pending(mdev);
-               ok = drbd_send_drequest_csum(mdev, sector, size,
-                                            digest, digest_size,
-                                            P_CSUM_RS_REQUEST);
+               ok = !drbd_send_drequest_csum(mdev, sector, size,
+                                             digest, digest_size,
+                                             P_CSUM_RS_REQUEST);
                kfree(digest);
        } else {
                dev_err(DEV, "kmalloc() of digest failed.\n");
@@ -1089,9 +1089,9 @@ int w_e_end_ov_req(struct drbd_work *w, int cancel)
        drbd_free_ee(mdev, peer_req);
        peer_req = NULL;
        inc_rs_pending(mdev);
-       ok = drbd_send_drequest_csum(mdev, sector, size,
-                                    digest, digest_size,
-                                    P_OV_REPLY);
+       ok = !drbd_send_drequest_csum(mdev, sector, size,
+                                     digest, digest_size,
+                                     P_OV_REPLY);
        if (!ok)
                dec_rs_pending(mdev);
        kfree(digest);