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

Commit 4604d636 authored by Philipp Reisner's avatar Philipp Reisner Committed by Jens Axboe
Browse files

drbd: Ensure to not trigger late-new-UUID creation multiple times 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 31a31dcc

drivers/block/drbd/drbd_main.c

+11 −7
Original line number Original line Diff line number Diff line
@@ -1217,7 +1217,8 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, 
		mdev->p_uuid = NULL;

		mdev->p_uuid = NULL;

		if (get_ldev(mdev)) {

		if (get_ldev(mdev)) {

			if ((ns.role == R_PRIMARY || ns.peer == R_PRIMARY) &&

			if ((ns.role == R_PRIMARY || ns.peer == R_PRIMARY) &&

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

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

			    !atomic_read(&mdev->new_c_uuid))

				atomic_set(&mdev->new_c_uuid, 2);

				atomic_set(&mdev->new_c_uuid, 2);

			put_ldev(mdev);

			put_ldev(mdev);

		}

		}
@@ -1225,7 +1226,8 @@ 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)) {

		/* Diskless peer becomes primary or got connected do diskless, primary peer. */

		/* Diskless peer becomes primary or got connected do diskless, primary peer. */

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

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

		    !atomic_read(&mdev->new_c_uuid))

			atomic_set(&mdev->new_c_uuid, 2);

			atomic_set(&mdev->new_c_uuid, 2);





		/* D_DISKLESS Peer becomes secondary */

		/* D_DISKLESS Peer becomes secondary */
@@ -1353,12 +1355,14 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, 
static int w_new_current_uuid(struct drbd_conf *mdev, struct drbd_work *w, int cancel)

static int w_new_current_uuid(struct drbd_conf *mdev, struct drbd_work *w, int cancel)

{

{

	if (get_ldev(mdev)) {

	if (get_ldev(mdev)) {

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

			drbd_uuid_new_current(mdev);

			drbd_uuid_new_current(mdev);

			if (get_net_conf(mdev)) {

			if (get_net_conf(mdev)) {

				drbd_send_uuids(mdev);

				drbd_send_uuids(mdev);

				put_net_conf(mdev);

				put_net_conf(mdev);

			}

			}

			drbd_md_sync(mdev);

			drbd_md_sync(mdev);

		}

		put_ldev(mdev);

		put_ldev(mdev);

	}

	}

	atomic_dec(&mdev->new_c_uuid);

	atomic_dec(&mdev->new_c_uuid);