lkml.org 
[lkml]   [2011]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/54] drbd: drbd_send_uuids() and its variants: Return 0 upon success and an error code otherwise
    Date
    From: Andreas Gruenbacher <agruen@linbit.com>

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
    ---
    drivers/block/drbd/drbd_main.c | 4 ++--
    drivers/block/drbd/drbd_receiver.c | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
    index 9ee7cf1..774b3ed 100644
    --- 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 0ca559b..9a9c688 100644
    --- 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);
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-09-05 14:05    [W:0.027 / U:61.228 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site