diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2011-03-16 00:43:02 +0100 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:44:33 +0100 |
| commit | 103ea275285970568cbc07ce01063aa69bac5577 (patch) | |
| tree | fd19028212ce48e5aab18b1bbfd0d24bcf649db5 /drivers/block | |
| parent | f725446353ab88ac1ec69bf1312ed83ce7b8a413 (diff) | |
drbd: drbd_send_sync_param(): 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')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 8 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index e41fffbfd67..80cfd302071 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -769,7 +769,7 @@ int drbd_send_sync_param(struct drbd_conf *mdev) { struct p_rs_param_95 *p; struct socket *sock; - int size, rv; + int size, err; const int apv = mdev->tconn->agreed_pro_version; size = apv <= 87 ? sizeof(struct p_rs_param) @@ -813,13 +813,13 @@ int drbd_send_sync_param(struct drbd_conf *mdev) if (apv >= 89) strcpy(p->csums_alg, mdev->tconn->net_conf->csums_alg); - rv = !_drbd_send_cmd(mdev, sock, cmd, &p->head, size, 0); + err = _drbd_send_cmd(mdev, sock, cmd, &p->head, size, 0); } else - rv = 0; /* not ok */ + err = -EIO; mutex_unlock(&mdev->tconn->data.mutex); - return rv; + return err; } int drbd_send_protocol(struct drbd_tconn *tconn) diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index d21c2ffe6c6..c35be86b121 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -763,7 +763,7 @@ int drbd_connected(int vnr, void *p, void *data) &mdev->tconn->cstate_mutex : &mdev->own_state_mutex; - ok &= drbd_send_sync_param(mdev); + ok &= !drbd_send_sync_param(mdev); ok &= drbd_send_sizes(mdev, 0, 0); ok &= drbd_send_uuids(mdev); ok &= drbd_send_state(mdev); |