From fbc137ee8ed32548f7e17c1350bce51ca96c979f Mon Sep 17 00:00:00 2001
From: Minchan Kim <minchan.kim@gmail.com>
Date: Tue, 8 Sep 2009 21:56:38 +0200
Subject: [PATCH] --- yaml --- r: 161220 b: refs/heads/master c:
 01edede41e352e4879a89cdc5468f72ffc89b713 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/block/blk-core.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 02a3bafa9f3f..560c91e3f8d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01e97f6b897bf06ec83375d691f2f4d57f5b3a09
+refs/heads/master: 01edede41e352e4879a89cdc5468f72ffc89b713
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
index 93051d151635..982d634e67f9 100644
--- a/trunk/block/blk-core.c
+++ b/trunk/block/blk-core.c
@@ -1462,8 +1462,6 @@ static inline void __generic_make_request(struct bio *bio)
 		if (old_sector != -1)
 			trace_block_remap(q, bio, old_dev, old_sector);
 
-		trace_block_bio_queue(q, bio);
-
 		old_sector = bio->bi_sector;
 		old_dev = bio->bi_bdev->bd_dev;
 
@@ -1476,6 +1474,8 @@ static inline void __generic_make_request(struct bio *bio)
 			goto end_io;
 		}
 
+		trace_block_bio_queue(q, bio);
+
 		ret = q->make_request_fn(q, bio);
 	} while (ret);