This patch merges complete_request() into end_that_request_last()
for cleanup.
complete_request() was introduced by earlier part of this patch-set,
not to break the existing users of end_that_request_last().
Since all users are converted to blk_end_request interfaces and
end_that_request_last() is no longer exported, the code can be
merged to end_that_request_last().
Cc: Boaz Harrosh <bharrosh@xxxxxxxxxxx>
Signed-off-by: Kiyoshi Ueda <k-ueda@xxxxxxxxxxxxx>
Signed-off-by: Jun'ichi Nomura <j-nomura@xxxxxxxxxxxxx>
---
block/ll_rw_blk.c | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
Index: 2.6.24-rc4/block/ll_rw_blk.c
===================================================================
--- 2.6.24-rc4.orig/block/ll_rw_blk.c
+++ 2.6.24-rc4/block/ll_rw_blk.c
@@ -3616,6 +3616,12 @@ static void end_that_request_last(struct
{
struct gendisk *disk = req->rq_disk;
+ if (blk_rq_tagged(req))
+ blk_queue_end_tag(req->q, req);
+
+ if (blk_queued_rq(req))
+ blkdev_dequeue_request(req);
+
if (unlikely(laptop_mode) && blk_fs_request(req))
laptop_io_completion();
@@ -3633,10 +3639,15 @@ static void end_that_request_last(struct
disk_round_stats(disk);
disk->in_flight--;
}
+
if (req->end_io)
req->end_io(req, error);
- else
+ else {
+ if (blk_bidi_rq(req))
+ __blk_put_request(req->next_rq->q, req->next_rq);
+
__blk_put_request(req->q, req);
+ }
}
static inline void __end_request(struct request *rq, int uptodate,
@@ -3737,20 +3748,6 @@ void end_request(struct request *req, in
}
EXPORT_SYMBOL(end_request);
-static void complete_request(struct request *rq, int error)
-{
- if (blk_rq_tagged(rq))
- blk_queue_end_tag(rq->q, rq);
-
- if (blk_queued_rq(rq))
- blkdev_dequeue_request(rq);
-
- if (blk_bidi_rq(rq) && !rq->end_io)
- __blk_put_request(rq->next_rq->q, rq->next_rq);
-
- end_that_request_last(rq, error);
-}
-
/**
* blk_end_io - Generic end_io function to complete a request.
* @rq: the request being processed
@@ -3793,7 +3790,7 @@ static int blk_end_io(struct request *rq
add_disk_randomness(rq->rq_disk);
spin_lock_irqsave(q->queue_lock, flags);
- complete_request(rq, error);
+ end_that_request_last(rq, error);
spin_unlock_irqrestore(q->queue_lock, flags);
return 0;
@@ -3841,7 +3838,7 @@ int __blk_end_request(struct request *rq
add_disk_randomness(rq->rq_disk);
- complete_request(rq, error);
+ end_that_request_last(rq, error);
return 0;
}
--
dm-devel mailing list
dm-devel@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/dm-devel
