From 09b12ced426eae4040b0b8051828e781bb5b8a56 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Wed, 5 Oct 2011 15:54:18 +0200 Subject: [PATCH] --- yaml --- r: 309319 b: refs/heads/master c: 5ba3dac52126699e541ac3ee37aad890ca835fc1 h: refs/heads/master i: 309317: 4c626de11d8d5568c873e9bfe22f3d949751e510 309315: c5c291380be2875408ff0465f63b73ba24ad1d0a 309311: ed54160b2969c9aa0ee4e1b53e19f5d091d52416 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a2a17b24b577..7c191fabe7c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b4e4d31268cbd885782bf3eee8027c852c9d191 +refs/heads/master: 5ba3dac52126699e541ac3ee37aad890ca835fc1 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 8658dac2853a..64318d4ca9ec 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -2138,7 +2138,11 @@ int drbd_gen_and_send_sync_uuid(struct drbd_conf *mdev) D_ASSERT(mdev->state.disk == D_UP_TO_DATE); - uuid = mdev->ldev->md.uuid[UI_BITMAP] + UUID_NEW_BM_OFFSET; + uuid = mdev->ldev->md.uuid[UI_BITMAP]; + if (uuid && uuid != UUID_JUST_CREATED) + uuid = uuid + UUID_NEW_BM_OFFSET; + else + get_random_bytes(&uuid, sizeof(u64)); drbd_uuid_set(mdev, UI_BITMAP, uuid); drbd_print_uuids(mdev, "updated sync UUID"); drbd_md_sync(mdev);