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

Commit 1f54b0c0 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Rusty Russell
Browse files

virtio-blk: drop config_mutex 



config_mutex served two purposes: prevent multiple concurrent config
change handlers, and synchronize access to config_enable flag.

Since commit dbf2576e
    workqueue: make all workqueues non-reentrant
all workqueues are non-reentrant, and config_enable
is now gone.

Get rid of the unnecessary lock.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent cc74f719

drivers/block/virtio_blk.c

+0 −8
Original line number Diff line number Diff line
@@ -41,9 +41,6 @@ struct virtio_blk 
	/* Process context for config space updates */

	struct work_struct config_work;



	/* Lock for config space updates */

	struct mutex config_lock;



	/* What host tells us, plus 2 for header & tailer. */

	unsigned int sg_elems;
@@ -344,8 +341,6 @@ static void virtblk_config_changed_work(struct work_struct *work) 
	char *envp[] = { "RESIZE=1", NULL };

	u64 capacity, size;



	mutex_lock(&vblk->config_lock);



	/* Host must always specify the capacity. */

	virtio_cread(vdev, struct virtio_blk_config, capacity, &capacity);
@@ -369,8 +364,6 @@ static void virtblk_config_changed_work(struct work_struct *work) 
	set_capacity(vblk->disk, capacity);

	revalidate_disk(vblk->disk);

	kobject_uevent_env(&disk_to_dev(vblk->disk)->kobj, KOBJ_CHANGE, envp);



	mutex_unlock(&vblk->config_lock);

}



static void virtblk_config_changed(struct virtio_device *vdev)
@@ -601,7 +594,6 @@ static int virtblk_probe(struct virtio_device *vdev) 


	vblk->vdev = vdev;

	vblk->sg_elems = sg_elems;

	mutex_init(&vblk->config_lock);



	INIT_WORK(&vblk->config_work, virtblk_config_changed_work);