diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2010-06-21 08:14:15 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2010-10-14 08:56:00 -0400 |
commit | 18a50fa213d46d5592f6542c91ab4c4760cf346c (patch) | |
tree | 2af1520311c4671bd0db2765a9b939b40e3ace04 /drivers/block/drbd/drbd_receiver.c | |
parent | 894c6a946199cf91e52bc1864c3dc6529cceb3db (diff) |
drbd: Now we need to handle the ed_uuid of an diskless, unconnected primary correctly
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_receiver.c')
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 8daa920c40a4..72bc1a130645 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -3104,6 +3104,11 @@ static int receive_uuids(struct drbd_conf *mdev, struct p_header *h) | |||
3104 | drbd_md_sync(mdev); | 3104 | drbd_md_sync(mdev); |
3105 | } | 3105 | } |
3106 | put_ldev(mdev); | 3106 | put_ldev(mdev); |
3107 | } else if (mdev->state.disk < D_INCONSISTENT && | ||
3108 | mdev->state.role == R_PRIMARY) { | ||
3109 | /* I am a diskless primary, the peer just created a new current UUID | ||
3110 | for me. */ | ||
3111 | drbd_set_ed_uuid(mdev, p_uuid[UI_CURRENT]); | ||
3107 | } | 3112 | } |
3108 | 3113 | ||
3109 | /* Before we test for the disk state, we should wait until an eventually | 3114 | /* Before we test for the disk state, we should wait until an eventually |