leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blk-mq: rename mq_flush_work struct request member

Browse Source 
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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Christoph Hellwig 2014-04-16 09:44:58 +02:00 committed by Jens Axboe
parent ed0791b2f8
commit f88a164b72
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/blk-flush.c
View File

@ -134,7 +134,7 @@ static void mq_flush_run(struct work_struct *work)
{ {
struct request *rq; 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)); memset(&rq->csd, 0, sizeof(rq->csd));
blk_mq_insert_request(rq, false, true, false); 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) static bool blk_flush_queue_rq(struct request *rq, bool add_front)
{ {
if (rq->q->mq_ops) { if (rq->q->mq_ops) {
INIT_WORK(&rq->mq_flush_work, mq_flush_run); INIT_WORK(&rq->requeue_work, mq_flush_run);
kblockd_schedule_work(&rq->mq_flush_work); kblockd_schedule_work(&rq->requeue_work);
return false; return false;
} else { } else {
if (add_front) if (add_front)

2
include/linux/blkdev.h
View File

@ -98,7 +98,7 @@ struct request {
struct list_head queuelist; struct list_head queuelist;
union { union {
struct call_single_data csd; struct call_single_data csd;
struct work_struct mq_flush_work; struct work_struct requeue_work;
unsigned long fifo_time; unsigned long fifo_time;
}; };