| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <alpine.DEB.2.00.0906091421370.17452@gandalf.stny.rr.com>
Date: Tue, 9 Jun 2009 14:24:07 -0400 (EDT)
From: Steven Rostedt <rostedt@...dmis.org>
To: linux-kernel@...r.kernel.org
cc: Ingo Molnar <mingo@...e.hu>,
Andrew Morton <akpm@...ux-foundation.org>,
Frederic Weisbecker <fweisbec@...il.com>,
Li Zefan <lizf@...fujitsu.com>
Subject: Re: [PATCH 2/2] tracing/events: convert block trace points to
TRACE_EVENT()
Ingo,
I added the patch the fix the compiler warnings on top of my last pull
request.
Please pull the latest tip/tracing/ftrace tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/ftrace
Steven Rostedt (1):
tracing: fix the block trace points print size
----
include/trace/events/block.h | 45 ++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 15 deletions(-)
---------------------------
commit 6556d1df88fe68f9836beeb43342a336691cb67c
Author: Steven Rostedt <srostedt@...hat.com>
Date: Tue Jun 9 14:04:26 2009 -0400
tracing: fix the block trace points print size
The sector field is either u64 or unsigned long depending on
the arch. This patch casts the sector to unsigned long long to
prevent the printf warnings.
[ Impact: remove compile warnings ]
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index a99d1e5..53effd4 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -37,7 +37,8 @@ TRACE_EVENT(block_rq_abort,
TP_printk("%d,%d %s (%s) %llu + %u [%d]",
MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->rwbs, __get_str(cmd),
- __entry->sector, __entry->nr_sector, __entry->errors)
+ (unsigned long long)__entry->sector,
+ __entry->nr_sector, __entry->errors)
);
TRACE_EVENT(block_rq_insert,
@@ -71,7 +72,8 @@ TRACE_EVENT(block_rq_insert,
TP_printk("%d,%d %s %u (%s) %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->rwbs, __entry->bytes, __get_str(cmd),
- __entry->sector, __entry->nr_sector, __entry->comm)
+ (unsigned long long)__entry->sector,
+ __entry->nr_sector, __entry->comm)
);
TRACE_EVENT(block_rq_issue,
@@ -105,7 +107,8 @@ TRACE_EVENT(block_rq_issue,
TP_printk("%d,%d %s %u (%s) %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->rwbs, __entry->bytes, __get_str(cmd),
- __entry->sector, __entry->nr_sector, __entry->comm)
+ (unsigned long long)__entry->sector,
+ __entry->nr_sector, __entry->comm)
);
TRACE_EVENT(block_rq_requeue,
@@ -137,7 +140,8 @@ TRACE_EVENT(block_rq_requeue,
TP_printk("%d,%d %s (%s) %llu + %u [%d]",
MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->rwbs, __get_str(cmd),
- __entry->sector, __entry->nr_sector, __entry->errors)
+ (unsigned long long)__entry->sector,
+ __entry->nr_sector, __entry->errors)
);
TRACE_EVENT(block_rq_complete,
@@ -169,7 +173,8 @@ TRACE_EVENT(block_rq_complete,
TP_printk("%d,%d %s (%s) %llu + %u [%d]",
MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->rwbs, __get_str(cmd),
- __entry->sector, __entry->nr_sector, __entry->errors)
+ (unsigned long long)__entry->sector,
+ __entry->nr_sector, __entry->errors)
);
TRACE_EVENT(block_bio_bounce,
@@ -195,7 +200,8 @@ TRACE_EVENT(block_bio_bounce,
TP_printk("%d,%d %s %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- __entry->sector, __entry->nr_sector, __entry->comm)
+ (unsigned long long)__entry->sector,
+ __entry->nr_sector, __entry->comm)
);
TRACE_EVENT(block_bio_complete,
@@ -221,7 +227,8 @@ TRACE_EVENT(block_bio_complete,
TP_printk("%d,%d %s %llu + %u [%d]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- __entry->sector, __entry->nr_sector, __entry->error)
+ (unsigned long long)__entry->sector,
+ __entry->nr_sector, __entry->error)
);
TRACE_EVENT(block_bio_backmerge,
@@ -248,7 +255,8 @@ TRACE_EVENT(block_bio_backmerge,
TP_printk("%d,%d %s %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- __entry->sector, __entry->nr_sector, __entry->comm)
+ (unsigned long long)__entry->sector,
+ __entry->nr_sector, __entry->comm)
);
TRACE_EVENT(block_bio_frontmerge,
@@ -275,7 +283,8 @@ TRACE_EVENT(block_bio_frontmerge,
TP_printk("%d,%d %s %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- __entry->sector, __entry->nr_sector, __entry->comm)
+ (unsigned long long)__entry->sector,
+ __entry->nr_sector, __entry->comm)
);
TRACE_EVENT(block_bio_queue,
@@ -302,7 +311,8 @@ TRACE_EVENT(block_bio_queue,
TP_printk("%d,%d %s %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- __entry->sector, __entry->nr_sector, __entry->comm)
+ (unsigned long long)__entry->sector,
+ __entry->nr_sector, __entry->comm)
);
TRACE_EVENT(block_getrq,
@@ -330,7 +340,8 @@ TRACE_EVENT(block_getrq,
TP_printk("%d,%d %s %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- __entry->sector, __entry->nr_sector, __entry->comm)
+ (unsigned long long)__entry->sector,
+ __entry->nr_sector, __entry->comm)
);
TRACE_EVENT(block_sleeprq,
@@ -358,7 +369,8 @@ TRACE_EVENT(block_sleeprq,
TP_printk("%d,%d %s %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- __entry->sector, __entry->nr_sector, __entry->comm)
+ (unsigned long long)__entry->sector,
+ __entry->nr_sector, __entry->comm)
);
TRACE_EVENT(block_plug,
@@ -441,7 +453,9 @@ TRACE_EVENT(block_split,
TP_printk("%d,%d %s %llu / %llu [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- __entry->sector, __entry->new_sector, __entry->comm)
+ (unsigned long long)__entry->sector,
+ (unsigned long long)__entry->new_sector,
+ __entry->comm)
);
TRACE_EVENT(block_remap,
@@ -471,9 +485,10 @@ TRACE_EVENT(block_remap,
TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
- __entry->sector, __entry->nr_sector,
+ (unsigned long long)__entry->sector,
+ __entry->nr_sector,
MAJOR(__entry->old_dev), MINOR(__entry->old_dev),
- __entry->old_sector)
+ (unsigned long long)__entry->old_sector)
);
#endif /* _TRACE_BLOCK_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists