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

Commit dd40e456 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

virtio_blk: stop using q->prepare_flush_fn 



use REQ_FLUSH flag instead.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 144d6ed5

drivers/block/virtio_blk.c

+21 −29
Original line number Diff line number Diff line
@@ -99,6 +99,12 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk, 
		return false;



	vbr->req = req;



	if (req->cmd_flags & REQ_FLUSH) {

		vbr->out_hdr.type = VIRTIO_BLK_T_FLUSH;

		vbr->out_hdr.sector = 0;

		vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);

	} else {

		switch (req->cmd_type) {

		case REQ_TYPE_FS:

			vbr->out_hdr.type = 0;
@@ -115,18 +121,11 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk, 
			vbr->out_hdr.sector = 0;

			vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);

			break;

	case REQ_TYPE_LINUX_BLOCK:

		if (req->cmd[0] == REQ_LB_OP_FLUSH) {

			vbr->out_hdr.type = VIRTIO_BLK_T_FLUSH;

			vbr->out_hdr.sector = 0;

			vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);

			break;

		}

		/*FALLTHRU*/

		default:

			/* We don't put anything else in the queue. */

			BUG();

		}

	}



	if (vbr->req->cmd_flags & REQ_HARDBARRIER)

		vbr->out_hdr.type |= VIRTIO_BLK_T_BARRIER;
@@ -195,12 +194,6 @@ static void do_virtblk_request(struct request_queue *q) 
		virtqueue_kick(vblk->vq);

}



static void virtblk_prepare_flush(struct request_queue *q, struct request *req)

{

	req->cmd_type = REQ_TYPE_LINUX_BLOCK;

	req->cmd[0] = REQ_LB_OP_FLUSH;

}



/* return id (s/n) string for *disk to *id_str

 */

static int virtblk_get_id(struct gendisk *disk, char *id_str)
@@ -373,8 +366,7 @@ static int __devinit virtblk_probe(struct virtio_device *vdev) 


	/* If barriers are supported, tell block layer that queue is ordered */

	if (virtio_has_feature(vdev, VIRTIO_BLK_F_FLUSH))

		blk_queue_ordered(q, QUEUE_ORDERED_DRAIN_FLUSH,

				  virtblk_prepare_flush);

		blk_queue_ordered(q, QUEUE_ORDERED_DRAIN_FLUSH, NULL);

	else if (virtio_has_feature(vdev, VIRTIO_BLK_F_BARRIER))

		blk_queue_ordered(q, QUEUE_ORDERED_TAG, NULL);