2022-02-22 21:08:58

by Ritesh Harjani

Subject: [RFC 7/9] ext4: Fix remaining two trace events to use same printk convention

All ext4 & jbd2 trace events starts with "dev Major:Minor".
While we are still improving/adding the ftrace events for FC,
let's fix last two remaining trace events to follow the same
convention.

Signed-off-by: Ritesh Harjani <[email protected]>
---
include/trace/events/ext4.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 6e66cb7ce624..233dbffa5ceb 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -2653,7 +2653,7 @@ TRACE_EVENT(ext4_fc_replay_scan,
__entry->off = off;
),

- TP_printk("FC scan pass on dev %d,%d: error %d, off %d",
+ TP_printk("dev %d,%d error %d, off %d",
MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->error, __entry->off)
);
@@ -2679,7 +2679,7 @@ TRACE_EVENT(ext4_fc_replay,
__entry->priv2 = priv2;
),

- TP_printk("FC Replay %d,%d: tag %d, ino %d, data1 %d, data2 %d",
+ TP_printk("dev %d,%d: tag %d, ino %d, data1 %d, data2 %d",
MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->tag, __entry->ino, __entry->priv1, __entry->priv2)
);
--
2.31.1

2022-02-23 11:23:01

by Jan Kara

Subject: Re: [RFC 7/9] ext4: Fix remaining two trace events to use same printk convention

On Wed 23-02-22 02:04:15, Ritesh Harjani wrote:
> All ext4 & jbd2 trace events starts with "dev Major:Minor".
> While we are still improving/adding the ftrace events for FC,
> let's fix last two remaining trace events to follow the same
> convention.
>
> Signed-off-by: Ritesh Harjani <[email protected]>

OK. Feel free to add:

Reviewed-by: Jan Kara <[email protected]>

Honza

> ---
> include/trace/events/ext4.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
> index 6e66cb7ce624..233dbffa5ceb 100644
> --- a/include/trace/events/ext4.h
> +++ b/include/trace/events/ext4.h
> @@ -2653,7 +2653,7 @@ TRACE_EVENT(ext4_fc_replay_scan,
> __entry->off = off;
> ),
>
> - TP_printk("FC scan pass on dev %d,%d: error %d, off %d",
> + TP_printk("dev %d,%d error %d, off %d",
> MAJOR(__entry->dev), MINOR(__entry->dev),
> __entry->error, __entry->off)
> );
> @@ -2679,7 +2679,7 @@ TRACE_EVENT(ext4_fc_replay,
> __entry->priv2 = priv2;
> ),
>
> - TP_printk("FC Replay %d,%d: tag %d, ino %d, data1 %d, data2 %d",
> + TP_printk("dev %d,%d: tag %d, ino %d, data1 %d, data2 %d",
> MAJOR(__entry->dev), MINOR(__entry->dev),
> __entry->tag, __entry->ino, __entry->priv1, __entry->priv2)
> );
> --
> 2.31.1
>
--
Jan Kara <[email protected]>
SUSE Labs, CR

2022-02-27 20:39:15

by harshad shirwadkar

Subject: Re: [RFC 7/9] ext4: Fix remaining two trace events to use same printk convention

Looks good.

Reviewed-by: Harshad Shirwadkar <[email protected]>

- Harshad

On Wed, 23 Feb 2022 at 01:45, Jan Kara <[email protected]> wrote:
>
> On Wed 23-02-22 02:04:15, Ritesh Harjani wrote:
> > All ext4 & jbd2 trace events starts with "dev Major:Minor".
> > While we are still improving/adding the ftrace events for FC,
> > let's fix last two remaining trace events to follow the same
> > convention.
> >
> > Signed-off-by: Ritesh Harjani <[email protected]>
>
> OK. Feel free to add:
>
> Reviewed-by: Jan Kara <[email protected]>
>
> Honza
>
> > ---
> > include/trace/events/ext4.h | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
> > index 6e66cb7ce624..233dbffa5ceb 100644
> > --- a/include/trace/events/ext4.h
> > +++ b/include/trace/events/ext4.h
> > @@ -2653,7 +2653,7 @@ TRACE_EVENT(ext4_fc_replay_scan,
> > __entry->off = off;
> > ),
> >
> > - TP_printk("FC scan pass on dev %d,%d: error %d, off %d",
> > + TP_printk("dev %d,%d error %d, off %d",
> > MAJOR(__entry->dev), MINOR(__entry->dev),
> > __entry->error, __entry->off)
> > );
> > @@ -2679,7 +2679,7 @@ TRACE_EVENT(ext4_fc_replay,
> > __entry->priv2 = priv2;
> > ),
> >
> > - TP_printk("FC Replay %d,%d: tag %d, ino %d, data1 %d, data2 %d",
> > + TP_printk("dev %d,%d: tag %d, ino %d, data1 %d, data2 %d",
> > MAJOR(__entry->dev), MINOR(__entry->dev),
> > __entry->tag, __entry->ino, __entry->priv1, __entry->priv2)
> > );
> > --
> > 2.31.1
> >
> --
> Jan Kara <[email protected]>
> SUSE Labs, CR