[PATCH 2/3] block: prevent duplicated bio completion report

[Namhyung Kim]

Since previous patch make block_bio_complete TP working,
it will generate duplicated BLK_TA_COMPLETEs for bounced
bios. Fix it.

Signed-off-by: Namhyung Kim <namhyung.kim@xxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
---
 include/linux/blk_types.h    |    3 +++
 include/trace/events/block.h |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 4053cbd4490e..45cd0074a1c8 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -97,6 +97,9 @@ struct bio {
 #define BIO_MAPPED_INTEGRITY 11/* integrity metadata has been remapped */
 #define bio_flagged(bio, flag)	((bio)->bi_flags & (1 << (flag)))
 
+/* masked bio's won't report its completion via tracepoint */
+#define BIO_COMPLETE_MASK	(1 << BIO_BOUNCED)
+
 /*
  * top 4 bits of bio flags indicate the pool this bio came from
  */
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index 96955f4828b3..72888542e186 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -219,7 +219,8 @@ TRACE_EVENT_CONDITION(block_bio_complete,
 
 	TP_ARGS(q, bio, error),
 
-	TP_CONDITION(bio->bi_bdev != NULL),
+	TP_CONDITION(bio->bi_bdev != NULL &&
+		     !(bio->bi_flags & BIO_COMPLETE_MASK)),
 
 	TP_STRUCT__entry(
 		__field( dev_t,		dev		)
-- 
1.7.9.rc1.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/