Thanks. I will ask Ted to merge this patch. Seiji >-----Original Message----- >From: linux-ext4-owner@xxxxxxxxxxxxxxx [mailto:linux-ext4-owner@xxxxxxxxxxxxxxx] On Behalf Of Jan Kara >Sent: Wednesday, January 11, 2012 8:02 PM >To: Seiji Aguchi >Cc: jack@xxxxxxx; dle-develop@xxxxxxxxxxxxxxxxxxxxx; linux-ext4@xxxxxxxxxxxxxxx; Lukas Czerner; Satoru Moriya >Subject: Re: [PATCH][RESEND]tracepoint: add drop_transaction/update_superblock_end to jbd2 > > Hello Seiji, > >On Wed 11-01-12 19:10:40, Seiji Aguchi wrote: >> Please review this patch below (and hopefully apply to your tree). >> This has already been reviewed by Lukas. > The patch looks OK to me so feel free to add >Acked-by: Jan Kara <jack@xxxxxxx> > but JBD2 patches are usually merged by Ted Tso <tytso@xxxxxxx> since >he is an ext4 maintainer and so he carries most of changes that modify >JBD2. > > Honza > >> --- >> This patch adds trace_jbd2_drop_transaction and >> trace_jbd2_update_superblock_end because there are similar tracepoints in jbd and >> they are needed in jbd2 as well. >> >> >> Signed-off-by: Seiji Aguchi <seiji.aguchi@xxxxxxx> >> Reviewed-by: Lukas Czerner <lczerner@xxxxxxxxxx> >> >> >> --- >> fs/jbd2/checkpoint.c | 2 ++ >> fs/jbd2/journal.c | 2 ++ >> include/trace/events/jbd2.h | 28 ++++++++++++++++++++++++++++ >> 3 files changed, 32 insertions(+), 0 deletions(-) >> >> diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c >> index 16a698b..2bfd8b0 100644 >> --- a/fs/jbd2/checkpoint.c >> +++ b/fs/jbd2/checkpoint.c >> @@ -797,5 +797,7 @@ void __jbd2_journal_drop_transaction(journal_t *journal, transaction_t *transact >> J_ASSERT(journal->j_committing_transaction != transaction); >> J_ASSERT(journal->j_running_transaction != transaction); >> >> + trace_jbd2_drop_transaction(journal, transaction); >> + >> jbd_debug(1, "Dropping transaction %d, all done\n", transaction->t_tid); >> } >> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c >> index f24df13..5953b3d 100644 >> --- a/fs/jbd2/journal.c >> +++ b/fs/jbd2/journal.c >> @@ -1185,6 +1185,8 @@ void jbd2_journal_update_superblock(journal_t *journal, int wait) >> } else >> write_dirty_buffer(bh, WRITE); >> >> + trace_jbd2_update_superblock_end(journal, wait); >> + >> out: >> /* If we have just flushed the log (by marking s_start==0), then >> * any future commit will have to be careful to update the >> diff --git a/include/trace/events/jbd2.h b/include/trace/events/jbd2.h >> index 7596441..ae59bc2 100644 >> --- a/include/trace/events/jbd2.h >> +++ b/include/trace/events/jbd2.h >> @@ -81,6 +81,13 @@ DEFINE_EVENT(jbd2_commit, jbd2_commit_logging, >> TP_ARGS(journal, commit_transaction) >> ); >> >> +DEFINE_EVENT(jbd2_commit, jbd2_drop_transaction, >> + >> + TP_PROTO(journal_t *journal, transaction_t *commit_transaction), >> + >> + TP_ARGS(journal, commit_transaction) >> +); >> + >> TRACE_EVENT(jbd2_end_commit, >> TP_PROTO(journal_t *journal, transaction_t *commit_transaction), >> >> @@ -229,6 +236,27 @@ TRACE_EVENT(jbd2_cleanup_journal_tail, >> __entry->block_nr, __entry->freed) >> ); >> >> +TRACE_EVENT(jbd2_update_superblock_end, >> + >> + TP_PROTO(journal_t *journal, int wait), >> + >> + TP_ARGS(journal, wait), >> + >> + TP_STRUCT__entry( >> + __field( dev_t, dev ) >> + __field( int, wait ) >> + ), >> + >> + TP_fast_assign( >> + __entry->dev = journal->j_fs_dev->bd_dev; >> + __entry->wait = wait; >> + ), >> + >> + TP_printk("dev %d,%d wait %d", >> + MAJOR(__entry->dev), MINOR(__entry->dev), >> + __entry->wait) >> +); >> + >> #endif /* _TRACE_JBD2_H */ >> >> /* This part must be outside protection */ >> -- >> 1.7.1 >> >-- >Jan Kara <jack@xxxxxxx> >SUSE Labs, CR >-- >To unsubscribe from this list: send the line "unsubscribe linux-ext4" in >the body of a message to majordomo@xxxxxxxxxxxxxxx >More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
