From e4326f6cf4ac1215cb704627cf9deb00f3880238 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 16 Mar 2011 01:07:20 +0100 Subject: [PATCH] --- yaml --- r: 345897 b: refs/heads/master c: 2ae5f95b1a3b6d60d9ce971e7f2c8ef84c306538 h: refs/heads/master i: 345895: 7d11e366a232821dddff12c88cc04457fc8c9ec2 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 4 ++-- trunk/drivers/block/drbd/drbd_receiver.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b14a79240b16..5e8cffbd6522 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 387eb30817f9009467a90cdbb3ab4dd0dc02a92f +refs/heads/master: 2ae5f95b1a3b6d60d9ce971e7f2c8ef84c306538 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 29b993b9b8d7..95586870001a 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/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/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 222fca535e93..1403e4b18a28 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/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);