diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-04-16 09:44:58 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-04-16 14:15:25 -0600 |
| commit | f88a164b72bd51fe4c89e06ac9939f2afe39c7ed (patch) | |
| tree | dbe94a5914a7fd45e8c7c0e88e5665012bea958c | |
| parent | ed0791b2f83cec4e77d88c4e9baabcebf9254a78 (diff) | |
| download | linux-0-day-f88a164b72bd51fe4c89e06ac9939f2afe39c7ed.tar.gz linux-0-day-f88a164b72bd51fe4c89e06ac9939f2afe39c7ed.tar.xz | |
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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | block/blk-flush.c | 6 | ||||
| -rw-r--r-- | include/linux/blkdev.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/block/blk-flush.c b/block/blk-flush.c index c41fc19f75d12..ec7a224d67335 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -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) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 95bb551273ab6..71288083a46fb 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -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; }; |