Commit:     c43a5082a61f351248c5f015ee5d4641309bd96e
Parent:     d39c9400ae0d60aaaf534b1ad860a9bc1413d8af
Author:     Jens Axboe <[EMAIL PROTECTED]>
AuthorDate: Fri Jan 12 12:20:26 2007 +0100
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Jan 12 10:46:49 2007 -0800

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 mm/bounce.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/bounce.c b/mm/bounce.c
index e4b62d2..643efbe 100644
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@ -237,6 +237,8 @@ static void __blk_queue_bounce(request_queue_t *q, struct 
bio **bio_orig,
        if (!bio)
+       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 
                pool = isa_page_pool;
-       blk_add_trace_bio(q, *bio_orig, BLK_TA_BOUNCE);
         * slow path
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to