aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2006-01-09 09:30:20 -0500
committerJens Axboe <axboe@suse.de>2006-01-09 09:30:20 -0500
commit356cebea1123804e4aa85b43ab39bbd0ac8e667c (patch)
treeaac7a1421808628fcc12340ce3ad4514c681b297 /block
parent5a57be8d100c67a033ec78f00d5a0cd387da72e9 (diff)
[BLOCK] Kill blk_attempt_remerge()
It's a broken interface, it's done way too late. And apparently it triggers slab problems in recent kernels as well (most likely after the generic dispatch code was merged). So kill it, ide-cd is the only user of it. Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'block')
-rw-r--r--block/ll_rw_blk.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index c182c9f4b2c4..c44d6fe9f6ce 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -2734,30 +2734,6 @@ static inline int attempt_front_merge(request_queue_t *q, struct request *rq)
2734 return 0; 2734 return 0;
2735} 2735}
2736 2736
2737/**
2738 * blk_attempt_remerge - attempt to remerge active head with next request
2739 * @q: The &request_queue_t belonging to the device
2740 * @rq: The head request (usually)
2741 *
2742 * Description:
2743 * For head-active devices, the queue can easily be unplugged so quickly
2744 * that proper merging is not done on the front request. This may hurt
2745 * performance greatly for some devices. The block layer cannot safely
2746 * do merging on that first request for these queues, but the driver can
2747 * call this function and make it happen any way. Only the driver knows
2748 * when it is safe to do so.
2749 **/
2750void blk_attempt_remerge(request_queue_t *q, struct request *rq)
2751{
2752 unsigned long flags;
2753
2754 spin_lock_irqsave(q->queue_lock, flags);
2755 attempt_back_merge(q, rq);
2756 spin_unlock_irqrestore(q->queue_lock, flags);
2757}
2758
2759EXPORT_SYMBOL(blk_attempt_remerge);
2760
2761static void init_request_from_bio(struct request *req, struct bio *bio) 2737static void init_request_from_bio(struct request *req, struct bio *bio)
2762{ 2738{
2763 req->flags |= REQ_CMD; 2739 req->flags |= REQ_CMD;