---

yaml --- r: 162953 b: refs/heads/master c: fe63b94 h: refs/heads/master i: 162951: 4a0ef65 v: v3
git-mirror · Sep 13, 2009 · a91e025 · a91e025
1 parent a0c2eaf
commit a91e025
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 689fd8b65d669b96d612ccc37d6fb87bf7ed6907
+refs/heads/master: fe63b94a430c0c8058de317f0a8ce921c69dbee4
diff --git a/trunk/include/trace/events/block.h b/trunk/include/trace/events/block.h
@@ -171,6 +171,7 @@ TRACE_EVENT(block_rq_complete,
 		  (unsigned long long)__entry->sector,
 		  __entry->nr_sector, __entry->errors)
 );
+
 TRACE_EVENT(block_bio_bounce,
 
 	TP_PROTO(struct request_queue *q, struct bio *bio),
@@ -186,7 +187,8 @@ TRACE_EVENT(block_bio_bounce,
 	),
 
 	TP_fast_assign(
-		__entry->dev		= bio->bi_bdev->bd_dev;
+		__entry->dev		= bio->bi_bdev ?
+					  bio->bi_bdev->bd_dev : 0;
 		__entry->sector		= bio->bi_sector;
 		__entry->nr_sector	= bio->bi_size >> 9;
 		blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);