summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_main.c
diff options
context:
space:
mode:
authorPhilipp Reisner2010-06-21 14:14:15 +0200
committerPhilipp Reisner2010-10-14 14:56:00 +0200
commit18a50fa213d46d5592f6542c91ab4c4760cf346c (patch)
tree2af1520311c4671bd0db2765a9b939b40e3ace04 /drivers/block/drbd/drbd_main.c
parentdrbd: Disabled the crashed_primary detection for re-attach of last data while... (diff)
downloadkernel-qcow2-linux-18a50fa213d46d5592f6542c91ab4c4760cf346c.tar.gz
kernel-qcow2-linux-18a50fa213d46d5592f6542c91ab4c4760cf346c.tar.xz
kernel-qcow2-linux-18a50fa213d46d5592f6542c91ab4c4760cf346c.zip
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_main.c')
-rw-r--r--drivers/block/drbd/drbd_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 106b9abdc430..c701805ed4b9 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/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)