diff options
-rw-r--r-- | drivers/block/virtio_blk.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 9d2223bba90c..693187df7601 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c | |||
@@ -29,9 +29,6 @@ struct virtio_blk | |||
29 | /* The disk structure for the kernel. */ | 29 | /* The disk structure for the kernel. */ |
30 | struct gendisk *disk; | 30 | struct gendisk *disk; |
31 | 31 | ||
32 | /* Request tracking. */ | ||
33 | struct list_head reqs; | ||
34 | |||
35 | mempool_t *pool; | 32 | mempool_t *pool; |
36 | 33 | ||
37 | /* Process context for config space updates */ | 34 | /* Process context for config space updates */ |
@@ -55,7 +52,6 @@ struct virtio_blk | |||
55 | 52 | ||
56 | struct virtblk_req | 53 | struct virtblk_req |
57 | { | 54 | { |
58 | struct list_head list; | ||
59 | struct request *req; | 55 | struct request *req; |
60 | struct virtio_blk_outhdr out_hdr; | 56 | struct virtio_blk_outhdr out_hdr; |
61 | struct virtio_scsi_inhdr in_hdr; | 57 | struct virtio_scsi_inhdr in_hdr; |
@@ -99,7 +95,6 @@ static void blk_done(struct virtqueue *vq) | |||
99 | } | 95 | } |
100 | 96 | ||
101 | __blk_end_request_all(vbr->req, error); | 97 | __blk_end_request_all(vbr->req, error); |
102 | list_del(&vbr->list); | ||
103 | mempool_free(vbr, vblk->pool); | 98 | mempool_free(vbr, vblk->pool); |
104 | } | 99 | } |
105 | /* In case queue is stopped waiting for more buffers. */ | 100 | /* In case queue is stopped waiting for more buffers. */ |
@@ -184,7 +179,6 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk, | |||
184 | return false; | 179 | return false; |
185 | } | 180 | } |
186 | 181 | ||
187 | list_add_tail(&vbr->list, &vblk->reqs); | ||
188 | return true; | 182 | return true; |
189 | } | 183 | } |
190 | 184 | ||
@@ -437,7 +431,6 @@ static int __devinit virtblk_probe(struct virtio_device *vdev) | |||
437 | goto out_free_index; | 431 | goto out_free_index; |
438 | } | 432 | } |
439 | 433 | ||
440 | INIT_LIST_HEAD(&vblk->reqs); | ||
441 | spin_lock_init(&vblk->lock); | 434 | spin_lock_init(&vblk->lock); |
442 | vblk->vdev = vdev; | 435 | vblk->vdev = vdev; |
443 | vblk->sg_elems = sg_elems; | 436 | vblk->sg_elems = sg_elems; |
@@ -591,9 +584,6 @@ static void __devexit virtblk_remove(struct virtio_device *vdev) | |||
591 | vblk->config_enable = false; | 584 | vblk->config_enable = false; |
592 | mutex_unlock(&vblk->config_lock); | 585 | mutex_unlock(&vblk->config_lock); |
593 | 586 | ||
594 | /* Nothing should be pending. */ | ||
595 | BUG_ON(!list_empty(&vblk->reqs)); | ||
596 | |||
597 | /* Stop all the virtqueues. */ | 587 | /* Stop all the virtqueues. */ |
598 | vdev->config->reset(vdev); | 588 | vdev->config->reset(vdev); |
599 | 589 | ||