From 5f7f81bb242544105a1a7cbf224aae6eb9f63ce6 Mon Sep 17 00:00:00 2001 From: Sedat Dilek Date: Thu, 1 Jan 2015 13:11:53 +0100 Subject: [PATCH] Revert "blk-mq: export blk_mq_freeze_queue and blk_mq_unfreeze_queue" This reverts commit 8f1f11d965c3129a76ffa833107005c0d3b6af8e. Commit b4c6a028774b ("blk-mq: Export freeze/unfreeze functions") pending in block.git#for-linus has already blk_mq_unfreeze_queue() exported. Thus, I revert this patch entirely and export blk_mq_freeze_queue() in an additional patch. CC: Ming Lei Signed-off-by: Sedat Dilek --- block/blk-mq.c | 4 +--- block/blk-mq.h | 1 + include/linux/blk-mq.h | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 2a0afea..1076f86 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -135,9 +135,8 @@ void blk_mq_freeze_queue(struct request_queue *q) blk_mq_freeze_queue_start(q); blk_mq_freeze_queue_wait(q); } -EXPORT_SYMBOL(blk_mq_freeze_queue); -void blk_mq_unfreeze_queue(struct request_queue *q) +static void blk_mq_unfreeze_queue(struct request_queue *q) { bool wake; @@ -150,7 +149,6 @@ void blk_mq_unfreeze_queue(struct request_queue *q) wake_up_all(&q->mq_freeze_wq); } } -EXPORT_SYMBOL(blk_mq_unfreeze_queue); bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx) { diff --git a/block/blk-mq.h b/block/blk-mq.h index 1bc1be9..206230e 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -27,6 +27,7 @@ struct blk_mq_ctx { void __blk_mq_complete_request(struct request *rq); void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async); +void blk_mq_freeze_queue(struct request_queue *q); void blk_mq_free_queue(struct request_queue *q); void blk_mq_clone_flush_request(struct request *flush_rq, struct request *orig_rq); diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index a855a69..8aded9a 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -212,8 +212,6 @@ void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async); void blk_mq_delay_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs); void blk_mq_tag_busy_iter(struct blk_mq_hw_ctx *hctx, busy_iter_fn *fn, void *priv); -void blk_mq_freeze_queue(struct request_queue *q); -void blk_mq_unfreeze_queue(struct request_queue *q); /* * Driver command data is immediately after the request. So subtract request -- 2.2.1