Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bca482e9 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Fixed current UUID generation 



Now, the new edition of the clause only fires if a diskless
peer gets promoted.

This is a fixup for "drbd: Delayed creation of current-UUID".

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 22f46ce2

drivers/block/drbd/drbd_main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1494,11 +1494,11 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, 
	}

	}





	if (ns.pdsk < D_INCONSISTENT && get_ldev(mdev)) {

	if (ns.pdsk < D_INCONSISTENT && get_ldev(mdev)) {

		if (ns.peer == R_PRIMARY && mdev->ldev->md.uuid[UI_BITMAP] == 0) {

		if (os.peer == R_SECONDARY && ns.peer == R_PRIMARY &&

		    mdev->ldev->md.uuid[UI_BITMAP] == 0 && ns.disk >= D_UP_TO_DATE) {

			drbd_uuid_new_current(mdev);

			drbd_uuid_new_current(mdev);

			drbd_send_uuids(mdev);

			drbd_send_uuids(mdev);

		}

		}



		/* D_DISKLESS Peer becomes secondary */

		/* D_DISKLESS Peer becomes secondary */

		if (os.peer == R_PRIMARY && ns.peer == R_SECONDARY)

		if (os.peer == R_PRIMARY && ns.peer == R_SECONDARY)

			/* We may still be Primary ourselves.

			/* We may still be Primary ourselves.