Commit d0fac025 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: make __blk_end_bidi_request private 



blk_insert_flush should be using __blk_end_request to start with.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent fa1a15c0

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

block/blk-flush.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

block/blk.h

+0 −2
Original line number Diff line number Diff line
@@ -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)