diff options
| author | Philipp Reisner | 2011-10-05 15:54:18 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-05-09 15:15:50 +0200 |
| commit | 5ba3dac52126699e541ac3ee37aad890ca835fc1 (patch) | |
| tree | 9edec116f6f75919043f4c0663d1f88709ae5de0 /drivers/block/drbd/drbd_main.c | |
| parent | drbd: drbd_nl_resize(): Fix missing put_ldev() on error path (diff) | |
| download | kernel-qcow2-linux-5ba3dac52126699e541ac3ee37aad890ca835fc1.tar.gz kernel-qcow2-linux-5ba3dac52126699e541ac3ee37aad890ca835fc1.tar.xz kernel-qcow2-linux-5ba3dac52126699e541ac3ee37aad890ca835fc1.zip | |
drbd: Derive sync-UUIDs only from the bitmap-uuid if it is non-zero
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 8658dac2853a..64318d4ca9ec 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/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); |