lkml.org 
[lkml]   [2014]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 7/8] blk-mq: rename mq_flush_work struct request member
Date
We will use this work_struct to requeue scsi commands from the complention
handler as well, so give it a more generic name.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-flush.c | 6 +++---
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 c41fc19..ec7a224 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 95bb551..7128808 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;
};

--
1.7.10.4


\
 
 \ /
  Last update: 2014-04-16 10:01    [W:0.087 / U:0.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site