|
@@ -41,9 +41,6 @@ struct virtio_blk
|
|
/* Process context for config space updates */
|
|
/* Process context for config space updates */
|
|
struct work_struct config_work;
|
|
struct work_struct config_work;
|
|
|
|
|
|
- /* Lock for config space updates */
|
|
|
|
- struct mutex config_lock;
|
|
|
|
-
|
|
|
|
/* What host tells us, plus 2 for header & tailer. */
|
|
/* What host tells us, plus 2 for header & tailer. */
|
|
unsigned int sg_elems;
|
|
unsigned int sg_elems;
|
|
|
|
|
|
@@ -344,8 +341,6 @@ static void virtblk_config_changed_work(struct work_struct *work)
|
|
char *envp[] = { "RESIZE=1", NULL };
|
|
char *envp[] = { "RESIZE=1", NULL };
|
|
u64 capacity, size;
|
|
u64 capacity, size;
|
|
|
|
|
|
- mutex_lock(&vblk->config_lock);
|
|
|
|
-
|
|
|
|
/* Host must always specify the capacity. */
|
|
/* Host must always specify the capacity. */
|
|
virtio_cread(vdev, struct virtio_blk_config, capacity, &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);
|
|
set_capacity(vblk->disk, capacity);
|
|
revalidate_disk(vblk->disk);
|
|
revalidate_disk(vblk->disk);
|
|
kobject_uevent_env(&disk_to_dev(vblk->disk)->kobj, KOBJ_CHANGE, envp);
|
|
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)
|
|
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->vdev = vdev;
|
|
vblk->sg_elems = sg_elems;
|
|
vblk->sg_elems = sg_elems;
|
|
- mutex_init(&vblk->config_lock);
|
|
|
|
|
|
|
|
INIT_WORK(&vblk->config_work, virtblk_config_changed_work);
|
|
INIT_WORK(&vblk->config_work, virtblk_config_changed_work);
|
|
|
|
|