diff options
| author | Andreas Gruenbacher | 2011-03-15 23:34:29 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:44:30 +0100 |
| commit | ce9879cb1f992448e10549525c8c46f9ca770a5b (patch) | |
| tree | 83d20c6be4cc573944aa0ca67652f84c30906419 /drivers/block/drbd/drbd_main.c | |
| parent | drbd: Add drbd_send_all(): Send an entire buffer (diff) | |
| download | kernel-qcow2-linux-ce9879cb1f992448e10549525c8c46f9ca770a5b.tar.gz kernel-qcow2-linux-ce9879cb1f992448e10549525c8c46f9ca770a5b.tar.xz kernel-qcow2-linux-ce9879cb1f992448e10549525c8c46f9ca770a5b.zip | |
drbd: conn_send_cmd2(): 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 | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 7f2afb8115ce..018c336aea09 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -769,21 +769,17 @@ int conn_send_cmd2(struct drbd_tconn *tconn, enum drbd_packet cmd, char *data, size_t size) { struct p_header80 h; - int ok; + int err; prepare_header80(&h, cmd, size); - - if (drbd_get_data_sock(tconn)) - return 0; - - ok = (sizeof(h) == - drbd_send(tconn, tconn->data.socket, &h, sizeof(h), 0)); - ok = ok && (size == - drbd_send(tconn, tconn->data.socket, data, size, 0)); - - drbd_put_data_sock(tconn); - - return ok; + err = drbd_get_data_sock(tconn); + if (!err) { + err = drbd_send_all(tconn, tconn->data.socket, &h, sizeof(h), 0); + if (!err) + err = drbd_send_all(tconn, tconn->data.socket, data, size, 0); + drbd_put_data_sock(tconn); + } + return err; } int drbd_send_sync_param(struct drbd_conf *mdev) @@ -882,7 +878,7 @@ int drbd_send_protocol(struct drbd_tconn *tconn) if (tconn->agreed_pro_version >= 87) strcpy(p->integrity_alg, tconn->net_conf->integrity_alg); - rv = conn_send_cmd2(tconn, P_PROTOCOL, p->head.payload, size - sizeof(struct p_header)); + rv = !conn_send_cmd2(tconn, P_PROTOCOL, p->head.payload, size - sizeof(struct p_header)); kfree(p); return rv; } |