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

Commit 1498ada7 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

mtd_blkdevs: dequeue in-flight request 



mtd_blkdevs processes requests one-by-one synchronously from a kthread
and can be easily converted to dequeueing model.  Convert it.

[ Impact: dequeue in-flight request ]

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent bab2a807

drivers/mtd/mtd_blkdevs.c

+13 −4
Original line number Diff line number Diff line
@@ -89,18 +89,22 @@ static int mtd_blktrans_thread(void *arg) 
{

	struct mtd_blktrans_ops *tr = arg;

	struct request_queue *rq = tr->blkcore_priv->rq;

	struct request *req = NULL;



	/* we might get involved when memory gets low, so use PF_MEMALLOC */

	current->flags |= PF_MEMALLOC;



	spin_lock_irq(rq->queue_lock);



	while (!kthread_should_stop()) {

		struct request *req;

		struct mtd_blktrans_dev *dev;

		int res;



		if (!req) {

			req = elv_next_request(rq);



			if (req)

				blkdev_dequeue_request(req);

		}

		if (!req) {

			set_current_state(TASK_INTERRUPTIBLE);

			spin_unlock_irq(rq->queue_lock);
@@ -120,8 +124,13 @@ static int mtd_blktrans_thread(void *arg) 


		spin_lock_irq(rq->queue_lock);



		__blk_end_request_cur(req, res);

		if (!__blk_end_request_cur(req, res))

			req = NULL;

	}



	if (req)

		__blk_end_request_all(req, -EIO);



	spin_unlock_irq(rq->queue_lock);



	return 0;