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

block: remove blk_end_request_err and __blk_end_request_err 



Both functions are entirely unused.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 10081552

block/blk-core.c

+0 −39
Original line number Diff line number Diff line
@@ -2875,25 +2875,6 @@ bool blk_end_request_cur(struct request *rq, int error) 
}

EXPORT_SYMBOL(blk_end_request_cur);



/**

 * blk_end_request_err - Finish a request till the next failure boundary.

 * @rq: the request to finish till the next failure boundary for

 * @error: must be negative errno

 *

 * Description:

 *     Complete @rq till the next failure boundary.

 *

 * Return:

 *     %false - we are done with this request

 *     %true  - still buffers pending for this request

 */

bool blk_end_request_err(struct request *rq, int error)

{

	WARN_ON(error >= 0);

	return blk_end_request(rq, error, blk_rq_err_bytes(rq));

}

EXPORT_SYMBOL_GPL(blk_end_request_err);



/**

 * __blk_end_request - Helper function for drivers to complete the request.

 * @rq:       the request being processed
@@ -2953,26 +2934,6 @@ bool __blk_end_request_cur(struct request *rq, int error) 
}

EXPORT_SYMBOL(__blk_end_request_cur);



/**

 * __blk_end_request_err - Finish a request till the next failure boundary.

 * @rq: the request to finish till the next failure boundary for

 * @error: must be negative errno

 *

 * Description:

 *     Complete @rq till the next failure boundary.  Must be called

 *     with queue lock held.

 *

 * Return:

 *     %false - we are done with this request

 *     %true  - still buffers pending for this request

 */

bool __blk_end_request_err(struct request *rq, int error)

{

	WARN_ON(error >= 0);

	return __blk_end_request(rq, error, blk_rq_err_bytes(rq));

}

EXPORT_SYMBOL_GPL(__blk_end_request_err);



void blk_rq_bio_prep(struct request_queue *q, struct request *rq,

		     struct bio *bio)

{

include/linux/blkdev.h

+0 −2
Original line number Diff line number Diff line
@@ -1127,12 +1127,10 @@ extern bool blk_end_request(struct request *rq, int error, 
			    unsigned int nr_bytes);

extern void blk_end_request_all(struct request *rq, int error);

extern bool blk_end_request_cur(struct request *rq, int error);

extern bool blk_end_request_err(struct request *rq, int error);

extern bool __blk_end_request(struct request *rq, int error,

			      unsigned int nr_bytes);

extern void __blk_end_request_all(struct request *rq, int error);

extern bool __blk_end_request_cur(struct request *rq, int error);

extern bool __blk_end_request_err(struct request *rq, int error);



extern void blk_complete_request(struct request *);

extern void __blk_complete_request(struct request *);