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

Commit 296b2f6a authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

block: convert to dequeueing model (easy ones) 



plat-omap/mailbox, floppy, viocd, mspro_block, i2o_block and
mmc/card/queue are already pretty close to dequeueing model and can be
converted with simple changes.  Convert them.

While at it,

* xen-blkfront: !fs check moved downwards to share dequeue call with
  normal path.

* mspro_block: __blk_end_request(..., blk_rq_cur_byte()) converted to
  __blk_end_request_cur()

* mmc/card/queue: loop of __blk_end_request() converted to
  __blk_end_request_all()

[ Impact: dequeue in-flight request ]

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alex Dubov <oakad@yahoo.com>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Cc: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent fb3ac7f6

arch/arm/plat-omap/mailbox.c

+9 −0
Original line number Diff line number Diff line
@@ -198,6 +198,8 @@ static void mbox_tx_work(struct work_struct *work) 


		spin_lock(q->queue_lock);

		rq = elv_next_request(q);

		if (rq)

			blkdev_dequeue_request(rq);

		spin_unlock(q->queue_lock);



		if (!rq)
@@ -208,6 +210,9 @@ static void mbox_tx_work(struct work_struct *work) 
		ret = __mbox_msg_send(mbox, tx_data->msg, tx_data->arg);

		if (ret) {

			enable_mbox_irq(mbox, IRQ_TX);

			spin_lock(q->queue_lock);

			blk_requeue_request(q, rq);

			spin_unlock(q->queue_lock);

			return;

		}
@@ -238,6 +243,8 @@ static void mbox_rx_work(struct work_struct *work) 
	while (1) {

		spin_lock_irqsave(q->queue_lock, flags);

		rq = elv_next_request(q);

		if (rq)

			blkdev_dequeue_request(rq);

		spin_unlock_irqrestore(q->queue_lock, flags);

		if (!rq)

			break;
@@ -345,6 +352,8 @@ omap_mbox_read(struct device *dev, struct device_attribute *attr, char *buf) 
	while (1) {

		spin_lock_irqsave(q->queue_lock, flags);

		rq = elv_next_request(q);

		if (rq)

			blkdev_dequeue_request(rq);

		spin_unlock_irqrestore(q->queue_lock, flags);



		if (!rq)

drivers/block/floppy.c

+3 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ static inline void unlock_fdc(void) 
	del_timer(&fd_timeout);

	cont = NULL;

	clear_bit(0, &fdc_busy);

	if (elv_next_request(floppy_queue))

	if (current_req || elv_next_request(floppy_queue))

		do_fd_request(floppy_queue);

	spin_unlock_irqrestore(&floppy_lock, flags);

	wake_up(&fdc_wait);
@@ -2913,6 +2913,8 @@ static void redo_fd_request(void) 


			spin_lock_irq(floppy_queue->queue_lock);

			req = elv_next_request(floppy_queue);

			if (req)

				blkdev_dequeue_request(req);

			spin_unlock_irq(floppy_queue->queue_lock);

			if (!req) {

				do_floppy = NULL;

drivers/block/xen-blkfront.c

+7 −6
Original line number Diff line number Diff line
@@ -301,22 +301,23 @@ static void do_blkif_request(struct request_queue *rq) 


	while ((req = elv_next_request(rq)) != NULL) {

		info = req->rq_disk->private_data;

		if (!blk_fs_request(req)) {

			__blk_end_request_cur(req, -EIO);

			continue;

		}



		if (RING_FULL(&info->ring))

			goto wait;



		blkdev_dequeue_request(req);



		if (!blk_fs_request(req)) {

			__blk_end_request_all(req, -EIO);

			continue;

		}



		pr_debug("do_blk_req %p: cmd %p, sec %lx, "

			 "(%u/%u) buffer:%p [%s]\n",

			 req, req->cmd, (unsigned long)blk_rq_pos(req),

			 blk_rq_cur_sectors(req), blk_rq_sectors(req),

			 req->buffer, rq_data_dir(req) ? "write" : "read");





		blkdev_dequeue_request(req);

		if (blkif_queue_request(req)) {

			blk_requeue_request(rq, req);

wait:

drivers/cdrom/viocd.c

+2 −0
Original line number Diff line number Diff line
@@ -298,6 +298,8 @@ static void do_viocd_request(struct request_queue *q) 
	struct request *req;



	while ((rwreq == 0) && ((req = elv_next_request(q)) != NULL)) {

		blkdev_dequeue_request(req);



		if (!blk_fs_request(req))

			__blk_end_request_all(req, -EIO);

		else if (send_request(req) < 0) {

drivers/memstick/core/mspro_block.c

+5 −3
Original line number Diff line number Diff line
@@ -672,8 +672,7 @@ static int mspro_block_issue_req(struct memstick_dev *card, int chunk) 
					       msb->req_sg);



		if (!msb->seg_count) {

			chunk = __blk_end_request(msb->block_req, -ENOMEM,

					blk_rq_cur_bytes(msb->block_req));

			chunk = __blk_end_request_cur(msb->block_req, -ENOMEM);

			continue;

		}
@@ -711,6 +710,7 @@ static int mspro_block_issue_req(struct memstick_dev *card, int chunk) 
		dev_dbg(&card->dev, "issue end\n");

		return -EAGAIN;

	}

	blkdev_dequeue_request(msb->block_req);



	dev_dbg(&card->dev, "trying again\n");

	chunk = 1;
@@ -825,8 +825,10 @@ static void mspro_block_submit_req(struct request_queue *q) 
		return;



	if (msb->eject) {

		while ((req = elv_next_request(q)) != NULL)

		while ((req = elv_next_request(q)) != NULL) {

			blkdev_dequeue_request(req);

			__blk_end_request_all(req, -ENODEV);

		}



		return;

	}