---

yaml --- r: 161220 b: refs/heads/master c: 01edede h: refs/heads/master v: v3
git-mirror · Sep 11, 2009 · fbc137e · fbc137e
1 parent ddcf146
commit fbc137e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);