Message ID | 20200629234314.10509-3-chaitanya.kulkarni@wdc.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | block: blktrace framework cleanup | expand |
On Mon, Jun 29, 2020 at 04:43:05PM -0700, Chaitanya Kulkarni wrote: > There are identical TRACE_EVENTS presents which can now take an > advantage of the block_bio_merge trace event class. > > This is a prep patch which renames block_bio_merge to block_bio so > that the next patches in this series will be able to resue it. The changes look good, but I'd merged it with the patches adding actual new users (which also look good to me).
On 6/29/20 10:10 PM, Christoph Hellwig wrote: > On Mon, Jun 29, 2020 at 04:43:05PM -0700, Chaitanya Kulkarni wrote: >> There are identical TRACE_EVENTS presents which can now take an >> advantage of the block_bio_merge trace event class. >> >> This is a prep patch which renames block_bio_merge to block_bio so >> that the next patches in this series will be able to resue it. > The changes look good, but I'd merged it with the patches adding > actual new users (which also look good to me). > Okay, will merge it.
diff --git a/include/trace/events/block.h b/include/trace/events/block.h index 237d40a48429..b5be387c4115 100644 --- a/include/trace/events/block.h +++ b/include/trace/events/block.h @@ -295,7 +295,7 @@ TRACE_EVENT(block_bio_complete, __entry->nr_sector, __entry->error) ); -DECLARE_EVENT_CLASS(block_bio_merge, +DECLARE_EVENT_CLASS(block_bio, TP_PROTO(struct bio *bio), @@ -330,7 +330,7 @@ DECLARE_EVENT_CLASS(block_bio_merge, * Merging block request @bio to the end of an existing block request * in queue. */ -DEFINE_EVENT(block_bio_merge, block_bio_backmerge, +DEFINE_EVENT(block_bio, block_bio_backmerge, TP_PROTO(struct bio *bio), @@ -344,7 +344,7 @@ DEFINE_EVENT(block_bio_merge, block_bio_backmerge, * Merging block IO operation @bio to the beginning of an existing block * operation in queue. */ -DEFINE_EVENT(block_bio_merge, block_bio_frontmerge, +DEFINE_EVENT(block_bio, block_bio_frontmerge, TP_PROTO(struct bio *bio),
There are identical TRACE_EVENTS presents which can now take an advantage of the block_bio_merge trace event class. This is a prep patch which renames block_bio_merge to block_bio so that the next patches in this series will be able to resue it. Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> --- include/trace/events/block.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)