xfs: disambiguate units for ftrace fields tagged "count"

Some of our tracepoints have a field known as "count".  That name
doesn't describe any units, which makes the fields not very useful.
Rename the fields to capture units and ensure the format is hexadecimal
when we're referring to blocks, extents, or IO operations.

"fsbcount" are in units of fs blocks
"bytecount" are in units of bytes

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 4169dc6cb5b905a5a7197b9f80e6afca43a5c87d..cc479caffd55b27b4d1109102925371841b9a9c7 100644 (file)
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -346,7 +346,7 @@ DECLARE_EVENT_CLASS(xfs_bmap_class,
                __entry->caller_ip = caller_ip;
        ),
        TP_printk("dev %d:%d ino 0x%llx state %s cur %p/%d "
-                 "fileoff 0x%llx startblock 0x%llx count %lld flag %d caller %pS",
+                 "fileoff 0x%llx startblock 0x%llx fsbcount 0x%llx flag %d caller %pS",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  __entry->ino,
                  __print_flags(__entry->bmap_state, "|", XFS_BMAP_EXT_FLAGS),
@@ -1392,7 +1392,7 @@ DECLARE_EVENT_CLASS(xfs_file_class,
                __entry->offset = iocb->ki_pos;
                __entry->count = iov_iter_count(iter);
        ),
-       TP_printk("dev %d:%d ino 0x%llx size 0x%llx pos 0x%llx count 0x%zx",
+       TP_printk("dev %d:%d ino 0x%llx size 0x%llx pos 0x%llx bytecount 0x%zx",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  __entry->ino,
                  __entry->size,
@@ -1439,7 +1439,7 @@ DECLARE_EVENT_CLASS(xfs_imap_class,
                __entry->startblock = irec ? irec->br_startblock : 0;
                __entry->blockcount = irec ? irec->br_blockcount : 0;
        ),
-       TP_printk("dev %d:%d ino 0x%llx size 0x%llx pos 0x%llx count %zd "
+       TP_printk("dev %d:%d ino 0x%llx size 0x%llx pos 0x%llx bytecount 0x%zx "
                  "fork %s startoff 0x%llx startblock 0x%llx fsbcount 0x%llx",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  __entry->ino,
@@ -1482,7 +1482,7 @@ DECLARE_EVENT_CLASS(xfs_simple_io_class,
                __entry->count = count;
        ),
        TP_printk("dev %d:%d ino 0x%llx isize 0x%llx disize 0x%llx "
-                 "pos 0x%llx count %zd",
+                 "pos 0x%llx bytecount 0x%zx",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  __entry->ino,
                  __entry->isize,
@@ -3227,7 +3227,7 @@ DECLARE_EVENT_CLASS(xfs_double_io_class,
                __field(loff_t, src_isize)
                __field(loff_t, src_disize)
                __field(loff_t, src_offset)
-               __field(size_t, len)
+               __field(long long, len)
                __field(xfs_ino_t, dest_ino)
                __field(loff_t, dest_isize)
                __field(loff_t, dest_disize)
@@ -3245,7 +3245,7 @@ DECLARE_EVENT_CLASS(xfs_double_io_class,
                __entry->dest_disize = dest->i_disk_size;
                __entry->dest_offset = doffset;
        ),
-       TP_printk("dev %d:%d count %zd "
+       TP_printk("dev %d:%d bytecount 0x%llx "
                  "ino 0x%llx isize 0x%llx disize 0x%llx pos 0x%llx -> "
                  "ino 0x%llx isize 0x%llx disize 0x%llx pos 0x%llx",
                  MAJOR(__entry->dev), MINOR(__entry->dev),