From a91e025803b4a1bee3c315cf65058fcd22ac83e6 Mon Sep 17 00:00:00 2001
From: Carsten Emde <Carsten.Emde@osadl.org>
Date: Sat, 12 Sep 2009 00:05:37 +0200
Subject: [PATCH] --- yaml --- r: 162953 b: refs/heads/master c:
 fe63b94a430c0c8058de317f0a8ce921c69dbee4 h: refs/heads/master i:   162951:
 4a0ef65b4947869a293358935a63f90d3fc902f1 v: v3

---
 [refs]                             | 2 +-
 trunk/include/trace/events/block.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9c672ed9744d..ea23a836aa71 100644
--- 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
index 9a74b468a229..d86af94691c2 100644
--- 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);