From e5f5fe5bc4d60fcf05649a6da08e3f2c873047fd Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Mon, 21 Jun 2010 14:14:15 +0200 Subject: [PATCH] --- yaml --- r: 213103 b: refs/heads/master c: 18a50fa213d46d5592f6542c91ab4c4760cf346c h: refs/heads/master i: 213101: 951de263f3a46a9716a1eeed126cce365f9a36b4 213099: b8968118f3705480311927ba7995e0f333423b28 213095: 6e76ff4f38b3c21ebf90a2ef9debb1defcffe36c 213087: f6707b16f529202d7dcef0ec149fa487ebf84941 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 4 +++- trunk/drivers/block/drbd/drbd_receiver.c | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 72e4b6bc72f0..a9e1953369d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 894c6a946199cf91e52bc1864c3dc6529cceb3db +refs/heads/master: 18a50fa213d46d5592f6542c91ab4c4760cf346c diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 106b9abdc430..c701805ed4b9 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -1297,8 +1297,10 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, } if (ns.pdsk < D_INCONSISTENT && get_ldev(mdev)) { - if (ns.peer == R_PRIMARY && mdev->ldev->md.uuid[UI_BITMAP] == 0) + if (ns.peer == R_PRIMARY && mdev->ldev->md.uuid[UI_BITMAP] == 0) { drbd_uuid_new_current(mdev); + drbd_send_uuids(mdev); + } /* D_DISKLESS Peer becomes secondary */ if (os.peer == R_PRIMARY && ns.peer == R_SECONDARY) diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 8daa920c40a4..72bc1a130645 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -3104,6 +3104,11 @@ static int receive_uuids(struct drbd_conf *mdev, struct p_header *h) drbd_md_sync(mdev); } put_ldev(mdev); + } else if (mdev->state.disk < D_INCONSISTENT && + mdev->state.role == R_PRIMARY) { + /* I am a diskless primary, the peer just created a new current UUID + for me. */ + drbd_set_ed_uuid(mdev, p_uuid[UI_CURRENT]); } /* Before we test for the disk state, we should wait until an eventually