Commit 1822952b authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe

block: let blk_end_request_all handle bidi requests

blk_end_request_all() and __blk_end_request_all() should finish all
bytes including bidi, by definition. That's what all bidi users need ,
bidi requests must be complete as a whole (partial completion is
impossible).
Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 9934c8c0
...@@ -910,8 +910,12 @@ static inline bool blk_end_request(struct request *rq, int error, ...@@ -910,8 +910,12 @@ static inline bool blk_end_request(struct request *rq, int error,
static inline void blk_end_request_all(struct request *rq, int error) static inline void blk_end_request_all(struct request *rq, int error)
{ {
bool pending; bool pending;
unsigned int bidi_bytes = 0;
pending = blk_end_request(rq, error, blk_rq_bytes(rq)); if (unlikely(blk_bidi_rq(rq)))
bidi_bytes = blk_rq_bytes(rq->next_rq);
pending = blk_end_bidi_request(rq, error, blk_rq_bytes(rq), bidi_bytes);
BUG_ON(pending); BUG_ON(pending);
} }
...@@ -962,8 +966,12 @@ static inline bool __blk_end_request(struct request *rq, int error, ...@@ -962,8 +966,12 @@ static inline bool __blk_end_request(struct request *rq, int error,
static inline void __blk_end_request_all(struct request *rq, int error) static inline void __blk_end_request_all(struct request *rq, int error)
{ {
bool pending; bool pending;
unsigned int bidi_bytes = 0;
if (unlikely(blk_bidi_rq(rq)))
bidi_bytes = blk_rq_bytes(rq->next_rq);
pending = __blk_end_request(rq, error, blk_rq_bytes(rq)); pending = __blk_end_bidi_request(rq, error, blk_rq_bytes(rq), bidi_bytes);
BUG_ON(pending); BUG_ON(pending);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment