jbd2: remove jbd2_dev_to_name() from jbd2 tracepoints

Using function calls in TP_printk causes perf heartburn, so print the
MAJOR/MINOR device numbers instead.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

2 files changed, 19 insertions, 23 deletions

diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index d087c2e7b2aa..38f307b8c334 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -1329,12 +1329,6 @@ extern int jbd_blocks_per_page(struct inode *inode);
 #define BUFFER_TRACE2(bh, bh2, info)    do {} while (0)
 #define JBUFFER_TRACE(jh, info) do {} while (0)
 
-/* 
- * jbd2_dev_to_name is a utility function used by the jbd2 and ext4 
- * tracing infrastructure to map a dev_t to a device name.
- */
-extern const char *jbd2_dev_to_name(dev_t device);
-
 #endif  /* __KERNEL__ */
 
 #endif  /* _LINUX_JBD2_H */
diff --git a/include/trace/events/jbd2.h b/include/trace/events/jbd2.h
index bf16545cc977..75964412ddbb 100644
--- a/include/trace/events/jbd2.h
+++ b/include/trace/events/jbd2.h
@@ -26,8 +26,8 @@ TRACE_EVENT(jbd2_checkpoint,
                 __entry->result         = result;
         ),
 
-        TP_printk("dev %s result %d",
-                  jbd2_dev_to_name(__entry->dev), __entry->result)
+        TP_printk("dev %d,%d result %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->result)
 );
 
 DECLARE_EVENT_CLASS(jbd2_commit,
@@ -48,9 +48,9 @@ DECLARE_EVENT_CLASS(jbd2_commit,
                 __entry->transaction    = commit_transaction->t_tid;
         ),
 
-        TP_printk("dev %s transaction %d sync %d",
-                  jbd2_dev_to_name(__entry->dev), __entry->transaction,
-                  __entry->sync_commit)
+        TP_printk("dev %d,%d transaction %d sync %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->transaction, __entry->sync_commit)
 );
 
 DEFINE_EVENT(jbd2_commit, jbd2_start_commit,
@@ -100,9 +100,9 @@ TRACE_EVENT(jbd2_end_commit,
                 __entry->head           = journal->j_tail_sequence;
         ),
 
-        TP_printk("dev %s transaction %d sync %d head %d",
-                  jbd2_dev_to_name(__entry->dev), __entry->transaction,
-                  __entry->sync_commit, __entry->head)
+        TP_printk("dev %d,%d transaction %d sync %d head %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->transaction, __entry->sync_commit, __entry->head)
 );
 
 TRACE_EVENT(jbd2_submit_inode_data,
@@ -120,8 +120,9 @@ TRACE_EVENT(jbd2_submit_inode_data,
                 __entry->ino    = inode->i_ino;
         ),
 
-        TP_printk("dev %s ino %lu",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino)
+        TP_printk("dev %d,%d ino %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino)
 );
 
 TRACE_EVENT(jbd2_run_stats,
@@ -156,9 +157,9 @@ TRACE_EVENT(jbd2_run_stats,
                 __entry->blocks_logged  = stats->rs_blocks_logged;
         ),
 
-        TP_printk("dev %s tid %lu wait %u running %u locked %u flushing %u "
+        TP_printk("dev %d,%d tid %lu wait %u running %u locked %u flushing %u "
                   "logging %u handle_count %u blocks %u blocks_logged %u",
-                  jbd2_dev_to_name(__entry->dev), __entry->tid,
+                  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid,
                   jiffies_to_msecs(__entry->wait),
                   jiffies_to_msecs(__entry->running),
                   jiffies_to_msecs(__entry->locked),
@@ -192,9 +193,9 @@ TRACE_EVENT(jbd2_checkpoint_stats,
                 __entry->dropped        = stats->cs_dropped;
         ),
 
-        TP_printk("dev %s tid %lu chp_time %u forced_to_close %u "
+        TP_printk("dev %d,%d tid %lu chp_time %u forced_to_close %u "
                   "written %u dropped %u",
-                  jbd2_dev_to_name(__entry->dev), __entry->tid,
+                  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid,
                   jiffies_to_msecs(__entry->chp_time),
                   __entry->forced_to_close, __entry->written, __entry->dropped)
 );
@@ -222,9 +223,10 @@ TRACE_EVENT(jbd2_cleanup_journal_tail,
                 __entry->freed          = freed;
         ),
 
-        TP_printk("dev %s from %u to %u offset %lu freed %lu",
-                  jbd2_dev_to_name(__entry->dev), __entry->tail_sequence,
-                  __entry->first_tid, __entry->block_nr, __entry->freed)
+        TP_printk("dev %d,%d from %u to %u offset %lu freed %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->tail_sequence, __entry->first_tid,
+                  __entry->block_nr, __entry->freed)
 );
 
 #endif /* _TRACE_JBD2_H */