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

Commit f88a164b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-mq: rename mq_flush_work struct request member 



We will use this work_struct to requeue scsi commands from the
completion handler as well, so give it a more generic name.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent ed0791b2

block/blk-flush.c

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void mq_flush_run(struct work_struct *work) 
{

	struct request *rq;



	rq = container_of(work, struct request, mq_flush_work);

	rq = container_of(work, struct request, requeue_work);



	memset(&rq->csd, 0, sizeof(rq->csd));

	blk_mq_insert_request(rq, false, true, false);
@@ -143,8 +143,8 @@ static void mq_flush_run(struct work_struct *work) 
static bool blk_flush_queue_rq(struct request *rq, bool add_front)

{

	if (rq->q->mq_ops) {

		INIT_WORK(&rq->mq_flush_work, mq_flush_run);

		kblockd_schedule_work(&rq->mq_flush_work);

		INIT_WORK(&rq->requeue_work, mq_flush_run);

		kblockd_schedule_work(&rq->requeue_work);

		return false;

	} else {

		if (add_front)

include/linux/blkdev.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct request { 
	struct list_head queuelist;

	union {

		struct call_single_data csd;

		struct work_struct mq_flush_work;

		struct work_struct requeue_work;

		unsigned long fifo_time;

	};