Message ID | 162924379266.761813.11427424580864028418.stgit@magnolia (mailing list archive) |
---|---|
State | Accepted, archived |
Headers | show |
Series | xfs: clean up ftrace field tags and formats | expand |
On Tue, Aug 17, 2021 at 04:43:12PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > Whenever we record i_disk_size (i.e. the ondisk file size), use the > "disize" tag and hexadecimal format consistently. > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > --- > fs/xfs/xfs_trace.h | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Looks good. Reviewed-by: Dave Chinner <dchinner@redhat.com>
On Tue, Aug 17, 2021 at 04:43:12PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > Whenever we record i_disk_size (i.e. the ondisk file size), use the > "disize" tag and hexadecimal format consistently. > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > --- > fs/xfs/xfs_trace.h | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> > > > diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h > index 07da753588d5..29bf5fbfa71b 100644 > --- a/fs/xfs/xfs_trace.h > +++ b/fs/xfs/xfs_trace.h > @@ -1386,7 +1386,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 bytecount 0x%zx", > + TP_printk("dev %d:%d ino 0x%llx disize 0x%llx pos 0x%llx bytecount 0x%zx", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->ino, > __entry->size, > @@ -1433,7 +1433,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 bytecount 0x%zx " > + TP_printk("dev %d:%d ino 0x%llx disize 0x%llx pos 0x%llx bytecount 0x%zx " > "fork %s startoff 0x%llx startblock 0x%llx blockcount 0x%llx", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->ino, > @@ -1512,7 +1512,7 @@ DECLARE_EVENT_CLASS(xfs_itrunc_class, > __entry->size = ip->i_disk_size; > __entry->new_size = new_size; > ), > - TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx", > + TP_printk("dev %d:%d ino 0x%llx disize 0x%llx new_size 0x%llx", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->ino, > __entry->size, > @@ -1543,7 +1543,7 @@ TRACE_EVENT(xfs_pagecache_inval, > __entry->start = start; > __entry->finish = finish; > ), > - TP_printk("dev %d:%d ino 0x%llx size 0x%llx start 0x%llx finish 0x%llx", > + TP_printk("dev %d:%d ino 0x%llx disize 0x%llx start 0x%llx finish 0x%llx", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->ino, > __entry->size, > @@ -1573,7 +1573,7 @@ TRACE_EVENT(xfs_bunmap, > __entry->caller_ip = caller_ip; > __entry->flags = flags; > ), > - TP_printk("dev %d:%d ino 0x%llx size 0x%llx fileoff 0x%llx blockcount 0x%llx" > + TP_printk("dev %d:%d ino 0x%llx disize 0x%llx fileoff 0x%llx blockcount 0x%llx" > "flags %s caller %pS", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->ino, >
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index 07da753588d5..29bf5fbfa71b 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h @@ -1386,7 +1386,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 bytecount 0x%zx", + TP_printk("dev %d:%d ino 0x%llx disize 0x%llx pos 0x%llx bytecount 0x%zx", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, __entry->size, @@ -1433,7 +1433,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 bytecount 0x%zx " + TP_printk("dev %d:%d ino 0x%llx disize 0x%llx pos 0x%llx bytecount 0x%zx " "fork %s startoff 0x%llx startblock 0x%llx blockcount 0x%llx", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, @@ -1512,7 +1512,7 @@ DECLARE_EVENT_CLASS(xfs_itrunc_class, __entry->size = ip->i_disk_size; __entry->new_size = new_size; ), - TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx", + TP_printk("dev %d:%d ino 0x%llx disize 0x%llx new_size 0x%llx", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, __entry->size, @@ -1543,7 +1543,7 @@ TRACE_EVENT(xfs_pagecache_inval, __entry->start = start; __entry->finish = finish; ), - TP_printk("dev %d:%d ino 0x%llx size 0x%llx start 0x%llx finish 0x%llx", + TP_printk("dev %d:%d ino 0x%llx disize 0x%llx start 0x%llx finish 0x%llx", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, __entry->size, @@ -1573,7 +1573,7 @@ TRACE_EVENT(xfs_bunmap, __entry->caller_ip = caller_ip; __entry->flags = flags; ), - TP_printk("dev %d:%d ino 0x%llx size 0x%llx fileoff 0x%llx blockcount 0x%llx" + TP_printk("dev %d:%d ino 0x%llx disize 0x%llx fileoff 0x%llx blockcount 0x%llx" "flags %s caller %pS", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino,