mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
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>
This commit is contained in:
parent
ed0791b2f8
commit
f88a164b72
2 changed files with 4 additions and 4 deletions
|
@ -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)
|
||||||
|
|
|
@ -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;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue