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>

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index e41fffbfd67956641187df12b5c50b9532ec4a13..80cfd3020711874c8f1afca7a823b4c9a0b7e245 100644 (file)
--- 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 d21c2ffe6c6f7796e4ff030ae897af0a5fee8672..c35be86b121ea432a1abaf72a77d112657a39a6a 100644 (file)
--- 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);