path: root/block
diff options
authorDamien Le Moal <damien.lemoal@wdc.com>2017-08-29 11:54:37 +0900
committerJens Axboe <axboe@kernel.dk>2017-08-29 09:49:31 -0600
commit5034435c84bea5e92c6a7dee70b51f0c0e441a51 (patch)
tree4efd5fc204c85bbfc2a5be9fc57a1bc52f228196 /block
parentskd: Let the block layer core choose .nr_requests (diff)
block: Make blk_dequeue_request() static
The only caller of this function is blk_start_request() in the same file. Fix blk_start_request() description accordingly. Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com> Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
2 files changed, 1 insertions, 5 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index fc1af9097dff..d709c0e3a2ac 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2615,7 +2615,7 @@ struct request *blk_peek_request(struct request_queue *q)
-void blk_dequeue_request(struct request *rq)
+static void blk_dequeue_request(struct request *rq)
struct request_queue *q = rq->q;
@@ -2642,9 +2642,6 @@ void blk_dequeue_request(struct request *rq)
* Description:
* Dequeue @req and start timeout timer on it. This hands off the
* request to the driver.
- *
- * Block internal functions which don't want to start timer should
- * call blk_dequeue_request().
void blk_start_request(struct request *req)
diff --git a/block/blk.h b/block/blk.h
index fde8b351c166..fcb9775b997d 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -64,7 +64,6 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq,
struct bio *bio);
void blk_queue_bypass_start(struct request_queue *q);
void blk_queue_bypass_end(struct request_queue *q);
-void blk_dequeue_request(struct request *rq);
void __blk_queue_free_tags(struct request_queue *q);
void blk_freeze_queue(struct request_queue *q);