diff options
author | Andreas Gruenbacher <agruen@linbit.com> | 2011-03-15 19:43:02 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 10:44:33 -0500 |
commit | 103ea275285970568cbc07ce01063aa69bac5577 (patch) | |
tree | fd19028212ce48e5aab18b1bbfd0d24bcf649db5 | |
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>
-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 e41fffbfd679..80cfd3020711 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) | |||
769 | { | 769 | { |
770 | struct p_rs_param_95 *p; | 770 | struct p_rs_param_95 *p; |
771 | struct socket *sock; | 771 | struct socket *sock; |
772 | int size, rv; | 772 | int size, err; |
773 | const int apv = mdev->tconn->agreed_pro_version; | 773 | const int apv = mdev->tconn->agreed_pro_version; |
774 | 774 | ||
775 | size = apv <= 87 ? sizeof(struct p_rs_param) | 775 | size = apv <= 87 ? sizeof(struct p_rs_param) |
@@ -813,13 +813,13 @@ int drbd_send_sync_param(struct drbd_conf *mdev) | |||
813 | if (apv >= 89) | 813 | if (apv >= 89) |
814 | strcpy(p->csums_alg, mdev->tconn->net_conf->csums_alg); | 814 | strcpy(p->csums_alg, mdev->tconn->net_conf->csums_alg); |
815 | 815 | ||
816 | rv = !_drbd_send_cmd(mdev, sock, cmd, &p->head, size, 0); | 816 | err = _drbd_send_cmd(mdev, sock, cmd, &p->head, size, 0); |
817 | } else | 817 | } else |
818 | rv = 0; /* not ok */ | 818 | err = -EIO; |
819 | 819 | ||
820 | mutex_unlock(&mdev->tconn->data.mutex); | 820 | mutex_unlock(&mdev->tconn->data.mutex); |
821 | 821 | ||
822 | return rv; | 822 | return err; |
823 | } | 823 | } |
824 | 824 | ||
825 | int drbd_send_protocol(struct drbd_tconn *tconn) | 825 | 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 d21c2ffe6c6f..c35be86b121e 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) | |||
763 | &mdev->tconn->cstate_mutex : | 763 | &mdev->tconn->cstate_mutex : |
764 | &mdev->own_state_mutex; | 764 | &mdev->own_state_mutex; |
765 | 765 | ||
766 | ok &= drbd_send_sync_param(mdev); | 766 | ok &= !drbd_send_sync_param(mdev); |
767 | ok &= drbd_send_sizes(mdev, 0, 0); | 767 | ok &= drbd_send_sizes(mdev, 0, 0); |
768 | ok &= drbd_send_uuids(mdev); | 768 | ok &= drbd_send_uuids(mdev); |
769 | ok &= drbd_send_state(mdev); | 769 | ok &= drbd_send_state(mdev); |