Commit c43a5082 authored Jan 12, 2007 by Jens Axboe Committed by Linus Torvalds Jan 12, 2007

[PATCH] blktrace: only add a bounce trace when we really bounce



Currently we issue a bounce trace when __blk_queue_bounce() is called,
but that merely means that the device has a lower dma mask than the
higher pages in the system. The bio itself may still be lower pages. So
move the bounce trace into __blk_queue_bounce(), when we know there will
actually be page bouncing.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent d39c9400

mm/bounce.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -237,6 +237,8 @@ static void __blk_queue_bounce(request_queue_t q, struct bio *bio_orig,
		if (!bio)
		return;

		blk_add_trace_bio(q, *bio_orig, BLK_TA_BOUNCE);

		/*
		* at least one page was bounced, fill in possible non-highmem
		* pages
		@@ -291,8 +293,6 @@ void blk_queue_bounce(request_queue_t q, struct bio *bio_orig)
		pool = isa_page_pool;
		}

		blk_add_trace_bio(q, *bio_orig, BLK_TA_BOUNCE);

		/*
		* slow path
		*/

Admin message