drbd: drbd_send_uuids() and its variants: Return 0 upon success and an error code...

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 29b993b9b8d750d2029ca56e8d83143cc7850b3d..95586870001aac2d93c89da16e2e911629354a66 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -872,7 +872,7 @@ int _drbd_send_uuids(struct drbd_conf *mdev, u64 uuid_flags)
        int i;
 
        if (!get_ldev_if_state(mdev, D_NEGOTIATING))
-               return 1;
+               return 0;
 
        for (i = UI_CURRENT; i < UI_SIZE; i++)
                p.uuid[i] = mdev->ldev ? cpu_to_be64(mdev->ldev->md.uuid[i]) : 0;
@@ -886,7 +886,7 @@ int _drbd_send_uuids(struct drbd_conf *mdev, u64 uuid_flags)
 
        put_ldev(mdev);
 
-       return !drbd_send_cmd(mdev, &mdev->tconn->data, P_UUIDS, &p.head, sizeof(p));
+       return drbd_send_cmd(mdev, &mdev->tconn->data, P_UUIDS, &p.head, sizeof(p));
 }
 
 int drbd_send_uuids(struct drbd_conf *mdev)

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 222fca535e930902a8571ae8ed67fc422725a907..1403e4b18a28fc110de1063325a7d2f207508f3e 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -765,7 +765,7 @@ int drbd_connected(int vnr, void *p, void *data)
 
        ok &= !drbd_send_sync_param(mdev);
        ok &= drbd_send_sizes(mdev, 0, 0);
-       ok &= drbd_send_uuids(mdev);
+       ok &= !drbd_send_uuids(mdev);
        ok &= !drbd_send_state(mdev);
        clear_bit(USE_DEGR_WFC_T, &mdev->flags);
        clear_bit(RESIZE_PENDING, &mdev->flags);