diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-07-03 04:45:40 -0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 12:24:15 -0400 |
| commit | 00fff26539bfe3fad21c164fc4002d9ede056fb0 (patch) | |
| tree | 4909c8eed03133b1d46f689e465ed1f579b8e282 /drivers/block/virtio_blk.c | |
| parent | afc23068103ccfbf1917eb2a007bc15ab5418cc9 (diff) | |
block: remove q->prepare_flush_fn completely
This removes q->prepare_flush_fn completely (changes the
blk_queue_ordered API).
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/virtio_blk.c')
| -rw-r--r-- | drivers/block/virtio_blk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index b277f9e6aba..0a3222fd444 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c | |||
| @@ -366,9 +366,9 @@ static int __devinit virtblk_probe(struct virtio_device *vdev) | |||
| 366 | 366 | ||
| 367 | /* If barriers are supported, tell block layer that queue is ordered */ | 367 | /* If barriers are supported, tell block layer that queue is ordered */ |
| 368 | if (virtio_has_feature(vdev, VIRTIO_BLK_F_FLUSH)) | 368 | if (virtio_has_feature(vdev, VIRTIO_BLK_F_FLUSH)) |
| 369 | blk_queue_ordered(q, QUEUE_ORDERED_DRAIN_FLUSH, NULL); | 369 | blk_queue_ordered(q, QUEUE_ORDERED_DRAIN_FLUSH); |
| 370 | else if (virtio_has_feature(vdev, VIRTIO_BLK_F_BARRIER)) | 370 | else if (virtio_has_feature(vdev, VIRTIO_BLK_F_BARRIER)) |
| 371 | blk_queue_ordered(q, QUEUE_ORDERED_TAG, NULL); | 371 | blk_queue_ordered(q, QUEUE_ORDERED_TAG); |
| 372 | 372 | ||
| 373 | /* If disk is read-only in the host, the guest should obey */ | 373 | /* If disk is read-only in the host, the guest should obey */ |
| 374 | if (virtio_has_feature(vdev, VIRTIO_BLK_F_RO)) | 374 | if (virtio_has_feature(vdev, VIRTIO_BLK_F_RO)) |