diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-05-20 10:33:17 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-05-20 10:33:17 +1000 |
| commit | 2a4ad5894c819978dca5595396d54d51c3aca694 (patch) | |
| tree | 62fcfac878219b36da9156785d832184194fd98a /fs/xfs/xfs_trace.h | |
| parent | a7792aad644a259375002db8c9d9e03fd50bf509 (diff) | |
| parent | 6e3e6d55e51774ec7cfc24975749bbddb28a9051 (diff) | |
| download | linux-2a4ad5894c819978dca5595396d54d51c3aca694.tar.gz linux-2a4ad5894c819978dca5595396d54d51c3aca694.tar.bz2 linux-2a4ad5894c819978dca5595396d54d51c3aca694.zip | |
Merge branch 'xfs-4.7-misc-fixes' into for-next
Diffstat (limited to 'fs/xfs/xfs_trace.h')
| -rw-r--r-- | fs/xfs/xfs_trace.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index f08129444280..840d52e38f10 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h @@ -1050,19 +1050,21 @@ DECLARE_EVENT_CLASS(xfs_log_item_class, ) TRACE_EVENT(xfs_log_force, - TP_PROTO(struct xfs_mount *mp, xfs_lsn_t lsn), - TP_ARGS(mp, lsn), + TP_PROTO(struct xfs_mount *mp, xfs_lsn_t lsn, unsigned long caller_ip), + TP_ARGS(mp, lsn, caller_ip), TP_STRUCT__entry( __field(dev_t, dev) __field(xfs_lsn_t, lsn) + __field(unsigned long, caller_ip) ), TP_fast_assign( __entry->dev = mp->m_super->s_dev; __entry->lsn = lsn; + __entry->caller_ip = caller_ip; ), - TP_printk("dev %d:%d lsn 0x%llx", + TP_printk("dev %d:%d lsn 0x%llx caller %ps", MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->lsn) + __entry->lsn, (void *)__entry->caller_ip) ) #define DEFINE_LOG_ITEM_EVENT(name) \ |