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>

diff --git a/block/blk-flush.c b/block/blk-flush.c
index c41fc19f75d12da854c657af8a3ca3d84ff6dc12..ec7a224d67335085186ad5ea09399d5c80014fb6 100644 (file)
--- 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 95bb551273ab65f362c03c8dc44ca4f321a5011f..71288083a46fb875c3fca56bacee3d66719913a5 100644 (file)
--- 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;
        };