diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-04-12 12:13:59 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-19 10:19:47 -0600 |
| commit | d0fac02563d4fccaaf7c112f314cc5ad39aabdee (patch) | |
| tree | 05b4851f625136e33cf0baf726b06dbe87c34b6a | |
| parent | fa1a15c08e23cb89c5837915b1989909bce47456 (diff) | |
block: make __blk_end_bidi_request private
blk_insert_flush should be using __blk_end_request to start with.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | block/blk-core.c | 2 | ||||
| -rw-r--r-- | block/blk-flush.c | 2 | ||||
| -rw-r--r-- | block/blk.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 728299323f65..9697b789408f 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2805,7 +2805,7 @@ static bool blk_end_bidi_request(struct request *rq, int error, * %false - we are done with this request * %true - still buffers pending for this request **/ -bool __blk_end_bidi_request(struct request *rq, int error, +static bool __blk_end_bidi_request(struct request *rq, int error, unsigned int nr_bytes, unsigned int bidi_bytes) { if (blk_update_bidi_request(rq, error, nr_bytes, bidi_bytes)) diff --git a/block/blk-flush.c b/block/blk-flush.c index 4e951d3bf548..c4e0880b54bb 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -447,7 +447,7 @@ void blk_insert_flush(struct request *rq) if (q->mq_ops) blk_mq_end_request(rq, 0); else - __blk_end_bidi_request(rq, 0, 0, 0); + __blk_end_request(rq, 0, 0); return; } diff --git a/block/blk.h b/block/blk.h index 07d375183f31..35b3041eec1a 100644 --- a/block/blk.h +++ b/block/blk.h @@ -67,8 +67,6 @@ 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); -bool __blk_end_bidi_request(struct request *rq, int error, - unsigned int nr_bytes, unsigned int bidi_bytes); void blk_freeze_queue(struct request_queue *q); static inline void blk_queue_enter_live(struct request_queue *q) |