block: implement and use [__]blk_end_request_all()

[mirror_ubuntu-artful-kernel.git] / block / blk-barrier.c

diff --git a/block/blk-barrier.c b/block/blk-barrier.c
index 20b4111fa0507a46a641faa295124afeaf5f4ea5..c8d087655eff8f94aaa0f65047bc9eea99777e25 100644 (file)
--- a/block/blk-barrier.c
+++ b/block/blk-barrier.c
@@ -106,10 +106,7 @@ bool blk_ordered_complete_seq(struct request_queue *q, unsigned seq, int error)
         */
        q->ordseq = 0;
        rq = q->orig_bar_rq;
-
-       if (__blk_end_request(rq, q->orderr, blk_rq_bytes(rq)))
-               BUG();
-
+       __blk_end_request_all(rq, q->orderr);
        return true;
 }
 
@@ -252,9 +249,7 @@ bool blk_do_ordered(struct request_queue *q, struct request **rqp)
                         * with prejudice.
                         */
                        elv_dequeue_request(q, rq);
-                       if (__blk_end_request(rq, -EOPNOTSUPP,
-                                             blk_rq_bytes(rq)))
-                               BUG();
+                       __blk_end_request_all(rq, -EOPNOTSUPP);
                        *rqp = NULL;
                        return false;
                }