On Thu, Aug 19, 2021 at 01:11:59PM +1000, Dave Chinner wrote: > On Tue, Aug 17, 2021 at 04:43:07PM -0700, Darrick J. Wong wrote: > > From: Darrick J. Wong <djwong@xxxxxxxxxx> > > > > 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. > > > > "blockcount" are in units of fs blocks > > "bytecount" are in units of bytes > > "icount" are in units of inode records > > This is where fsbcount and bbcount really look like a reasonable way > of encoding the unit into the description... :) > > Also, having noted in the previous patch that the icreate record > trace point has a count of inodes as "count", perhaps this icount > would be better as "ireccount" so that icount can be used as a count > of inodes... Ok, patch 9 updated. > > Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> > > --- > > fs/xfs/xfs_trace.h | 14 +++++++------- > > 1 file changed, 7 insertions(+), 7 deletions(-) > > > > > > diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h > > index 7ae654f7ae82..07da753588d5 100644 > > --- 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 blockcount 0x%llx flag %d caller %pS", > > MAJOR(__entry->dev), MINOR(__entry->dev), > > __entry->ino, > > __print_flags(__entry->bmap_state, "|", XFS_BMAP_EXT_FLAGS), > > @@ -806,7 +806,7 @@ DECLARE_EVENT_CLASS(xfs_iref_class, > > __entry->pincount = atomic_read(&ip->i_pincount); > > __entry->caller_ip = caller_ip; > > ), > > - TP_printk("dev %d:%d ino 0x%llx count %d pincount %d caller %pS", > > + TP_printk("dev %d:%d ino 0x%llx icount %d pincount %d caller %pS", > > MAJOR(__entry->dev), MINOR(__entry->dev), > > __entry->ino, > > __entry->count, > > I don't think this is correct. This count is the current active > reference count of the inode, not a count of inode records... Oops. I guess I got carried away. Fixed. --D > Cheers, > > Dave. > -- > Dave Chinner > david@xxxxxxxxxxxxx