Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fd8d0e1 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

block: make blk_end_request_cur() return bool



In the process of mindlessly copying [__]blk_end_request_all(),
[__]blk_end_request_cur() ended up returning void even though they're
partial completion functions.  Fix it.

[ Impact: fix braindead API ]

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 9eb55b03
Loading
Loading
Loading
Loading
+12 −4
Original line number Diff line number Diff line
@@ -903,10 +903,14 @@ static inline void blk_end_request_all(struct request *rq, int error)
 *
 * Description:
 *     Complete the current consecutively mapped chunk from @rq.
 *
 * Return:
 *     %false - we are done with this request
 *     %true  - still buffers pending for this request
 */
static inline void blk_end_request_cur(struct request *rq, int error)
static inline bool blk_end_request_cur(struct request *rq, int error)
{
	blk_end_request(rq, error, rq->hard_cur_sectors << 9);
	return blk_end_request(rq, error, rq->hard_cur_sectors << 9);
}

/**
@@ -952,10 +956,14 @@ static inline void __blk_end_request_all(struct request *rq, int error)
 * Description:
 *     Complete the current consecutively mapped chunk from @rq.  Must
 *     be called with queue lock held.
 *
 * Return:
 *     %false - we are done with this request
 *     %true  - still buffers pending for this request
 */
static inline void __blk_end_request_cur(struct request *rq, int error)
static inline bool __blk_end_request_cur(struct request *rq, int error)
{
	__blk_end_request(rq, error, rq->hard_cur_sectors << 9);
	return __blk_end_request(rq, error, rq->hard_cur_sectors << 9);
}

extern void blk_complete_request(struct request *);