diff options
| author | Andreas Gruenbacher | 2011-03-16 01:37:21 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:44:40 +0100 |
| commit | db1b0b724e56f34608b76197191ef0577a1ddd45 (patch) | |
| tree | 18d8d3a6eb530ecd545a81f392067091fc66b55d /drivers/block/drbd/drbd_main.c | |
| parent | drbd: drbd_send_drequest(): Return 0 upon success and an error code otherwise (diff) | |
| download | kernel-qcow2-linux-db1b0b724e56f34608b76197191ef0577a1ddd45.tar.gz kernel-qcow2-linux-db1b0b724e56f34608b76197191ef0577a1ddd45.tar.xz kernel-qcow2-linux-db1b0b724e56f34608b76197191ef0577a1ddd45.zip | |
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>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 34062e37df65..779bf5b10d5a 100644 --- 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) |