linux-2.6-xfs/drivers/block/ll_rw_blk.c - diff

Return to ll_rw_blk.c CVS log

Up to [OSS] / linux-2.6-xfs / drivers / block

version 1.16, 2005/08/29 15:50:38	version 1.17, 2005/09/07 15:13:10
Line 1625 void blk_cleanup_queue(request_queue_t *	Line 1625 void blk_cleanup_queue(request_queue_t *
__blk_queue_free_tags(q);	__blk_queue_free_tags(q);

if (q->blk_trace) {	if (q->blk_trace) {
relay_close(q->blk_trace->rchan);	blk_cleanup_trace(q->blk_trace);
kfree(q->blk_trace);
q->blk_trace = NULL;	q->blk_trace = NULL;
}	}

Line 2637 static int __make_request(request_queue_	Line 2636 static int __make_request(request_queue_
}	}

get_rq:	get_rq:
blk_add_trace_bio(q, bio, BLK_TA_QUEUE);

/*	/*
* Grab a free request. This is might sleep but can not fail.	* Grab a free request. This is might sleep but can not fail.
* Returns with the queue unlocked.	* Returns with the queue unlocked.
Line 2679 get_rq:	Line 2676 get_rq:
req->rq_disk = bio->bi_bdev->bd_disk;	req->rq_disk = bio->bi_bdev->bd_disk;
req->start_time = jiffies;	req->start_time = jiffies;

	blk_add_trace_bio(q, bio, BLK_TA_QUEUE);

spin_lock_irq(q->queue_lock);	spin_lock_irq(q->queue_lock);
if (elv_queue_empty(q))	if (elv_queue_empty(q))
blk_plug_device(q);	blk_plug_device(q);