Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756236AbaAISy1 (ORCPT ); Thu, 9 Jan 2014 13:54:27 -0500 Received: from mail-pb0-f43.google.com ([209.85.160.43]:63106 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752814AbaAISyS (ORCPT ); Thu, 9 Jan 2014 13:54:18 -0500 MIME-Version: 1.0 Date: Thu, 9 Jan 2014 10:54:17 -0800 Message-ID: Subject: [block:for-3.14/core] blk-mq: Compile fix for null_blk From: Muthu Kumar To: Jens Axboe , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Jens, Compiling null_blk.ko failed with error that blk_mq_free_queue() was defined implicitly. So, moved the declaration from block/blk-mq.h to include/linux/blk-mq.h and exported it. Signed-off-by: Muthukumar Ratty ---------------------- block/blk-mq.c | 1 + block/blk-mq.h | 1 - include/linux/blk-mq.h | 1 + 3 files changed, 2 insertions(+), 1 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 57039fc..3e08b87 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1422,6 +1422,7 @@ void blk_mq_free_queue(struct request_queue *q) list_del_init(&q->all_q_node); mutex_unlock(&all_q_mutex); } +EXPORT_SYMBOL(blk_mq_free_queue); /* Basically redo blk_mq_init_queue with queue frozen */ static void blk_mq_queue_reinit(struct request_queue *q) diff --git a/block/blk-mq.h b/block/blk-mq.h index 5c39179..35ff4f7 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -28,7 +28,6 @@ void blk_mq_run_request(struct request *rq, bool run_queue, bool async); void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async); void blk_mq_init_flush(struct request_queue *q); void blk_mq_drain_queue(struct request_queue *q); -void blk_mq_free_queue(struct request_queue *q); /* * CPU hotplug helpers diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 851d34b..51109b8 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -113,6 +113,7 @@ enum { }; struct request_queue *blk_mq_init_queue(struct blk_mq_reg *, void *); +void blk_mq_free_queue(struct request_queue *q); int blk_mq_register_disk(struct gendisk *); void blk_mq_unregister_disk(struct gendisk *); void blk_mq_init_commands(struct request_queue *, void (*init)(void *data, struct blk_mq_hw_ctx *, struct request *, unsigned int), void *data); ------------------------------- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/