diff options
| author | Andreas Gruenbacher | 2011-03-16 11:35:20 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:44:42 +0100 |
| commit | 7b57b89d624cfdefc91d0a8b015c494c25a49292 (patch) | |
| tree | 65919ee5a887f715d7e25d2b6a0ab32071a8d057 /drivers/block/drbd/drbd_main.c | |
| parent | drbd: _drbd_send_zc_ee(): Return 0 upon success and an error code otherwise (diff) | |
| download | kernel-qcow2-linux-7b57b89d624cfdefc91d0a8b015c494c25a49292.tar.gz kernel-qcow2-linux-7b57b89d624cfdefc91d0a8b015c494c25a49292.tar.xz kernel-qcow2-linux-7b57b89d624cfdefc91d0a8b015c494c25a49292.zip | |
drbd: drbd_send_block(): 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 | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 59fb39f15a11..8fee2fe4c853 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -1608,7 +1608,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req) int drbd_send_block(struct drbd_conf *mdev, enum drbd_packet cmd, struct drbd_peer_request *peer_req) { - int ok; + int err; struct p_data p; void *dgb; int dgs; @@ -1627,21 +1627,22 @@ int drbd_send_block(struct drbd_conf *mdev, enum drbd_packet cmd, * This one may be interrupted by DRBD_SIG and/or DRBD_SIGKILL * in response to admin command or module unload. */ - if (drbd_get_data_sock(mdev->tconn)) - return 0; - - ok = sizeof(p) == drbd_send(mdev->tconn, mdev->tconn->data.socket, &p, sizeof(p), dgs ? MSG_MORE : 0); - if (ok && dgs) { + err = drbd_get_data_sock(mdev->tconn); + if (err) + return err; + err = drbd_send_all(mdev->tconn, mdev->tconn->data.socket, &p, + sizeof(p), dgs ? MSG_MORE : 0); + if (!err && dgs) { dgb = mdev->tconn->int_dig_out; drbd_csum_ee(mdev, mdev->tconn->integrity_w_tfm, peer_req, dgb); - ok = dgs == drbd_send(mdev->tconn, mdev->tconn->data.socket, dgb, dgs, 0); + err = drbd_send_all(mdev->tconn, mdev->tconn->data.socket, dgb, + dgs, 0); } - if (ok) - ok = !_drbd_send_zc_ee(mdev, peer_req); - + if (!err) + err = _drbd_send_zc_ee(mdev, peer_req); drbd_put_data_sock(mdev->tconn); - return ok; + return err; } int drbd_send_oos(struct drbd_conf *mdev, struct drbd_request *req) |