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

Commit 720979fb authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner
Browse files

drbd: move set_disk_ro() to after we persisted the new role 



This probably does not have any real life impact,
but we should first persist any potentially new UUID
and other meta data flags, as well as our new role,
before we allow/disallow write access.

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

drivers/block/drbd/drbd_nl.c

+1 −3
Original line number Diff line number Diff line
@@ -655,7 +655,6 @@ drbd_set_role(struct drbd_device *const device, enum drbd_role new_role, int for 
	/* FIXME also wait for all pending P_BARRIER_ACK? */



	if (new_role == R_SECONDARY) {

		set_disk_ro(device->vdisk, true);

		if (get_ldev(device)) {

			device->ldev->md.uuid[UI_CURRENT] &= ~(u64)1;

			put_ldev(device);
@@ -667,7 +666,6 @@ drbd_set_role(struct drbd_device *const device, enum drbd_role new_role, int for 
			nc->discard_my_data = 0; /* without copy; single bit op is atomic */

		mutex_unlock(&device->resource->conf_update);



		set_disk_ro(device->vdisk, false);

		if (get_ldev(device)) {

			if (((device->state.conn < C_CONNECTED ||

			       device->state.pdsk <= D_FAILED)
@@ -690,7 +688,7 @@ drbd_set_role(struct drbd_device *const device, enum drbd_role new_role, int for 
	}



	drbd_md_sync(device);



	set_disk_ro(device->vdisk, new_role == R_SECONDARY);

	kobject_uevent(&disk_to_dev(device->vdisk)->kobj, KOBJ_CHANGE);

out:

	mutex_unlock(device->state_mutex);