On Tue, Aug 17, 2021 at 04:43:23PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@xxxxxxxxxx>
>
> For the remaining xfs_buf tracepoints, convert all the tags to
> xfs_daddr_t units and retag them 'daddrcount' to match everything else.
>
> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> ---
I agree with Dave on s/daddrcount/bbcount/, other than that:
Reviewed-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
> fs/xfs/xfs_trace.h | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index 474fdaffdccf..3b53fd681ce7 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -397,7 +397,7 @@ DECLARE_EVENT_CLASS(xfs_buf_class,
> __entry->flags = bp->b_flags;
> __entry->caller_ip = caller_ip;
> ),
> - TP_printk("dev %d:%d daddr 0x%llx nblks 0x%x hold %d pincount %d "
> + TP_printk("dev %d:%d daddr 0x%llx daddrcount 0x%x hold %d pincount %d "
> "lock %d flags %s caller %pS",
> MAJOR(__entry->dev), MINOR(__entry->dev),
> (unsigned long long)__entry->bno,
> @@ -448,7 +448,7 @@ DECLARE_EVENT_CLASS(xfs_buf_flags_class,
> TP_STRUCT__entry(
> __field(dev_t, dev)
> __field(xfs_daddr_t, bno)
> - __field(size_t, buffer_length)
> + __field(unsigned int, length)
> __field(int, hold)
> __field(int, pincount)
> __field(unsigned, lockval)
> @@ -458,18 +458,18 @@ DECLARE_EVENT_CLASS(xfs_buf_flags_class,
> TP_fast_assign(
> __entry->dev = bp->b_target->bt_dev;
> __entry->bno = bp->b_bn;
> - __entry->buffer_length = BBTOB(bp->b_length);
> + __entry->length = bp->b_length;
> __entry->flags = flags;
> __entry->hold = atomic_read(&bp->b_hold);
> __entry->pincount = atomic_read(&bp->b_pin_count);
> __entry->lockval = bp->b_sema.count;
> __entry->caller_ip = caller_ip;
> ),
> - TP_printk("dev %d:%d daddr 0x%llx len 0x%zx hold %d pincount %d "
> + TP_printk("dev %d:%d daddr 0x%llx daddrcount 0x%x hold %d pincount %d "
> "lock %d flags %s caller %pS",
> MAJOR(__entry->dev), MINOR(__entry->dev),
> (unsigned long long)__entry->bno,
> - __entry->buffer_length,
> + __entry->length,
> __entry->hold,
> __entry->pincount,
> __entry->lockval,
> @@ -491,7 +491,7 @@ TRACE_EVENT(xfs_buf_ioerror,
> TP_STRUCT__entry(
> __field(dev_t, dev)
> __field(xfs_daddr_t, bno)
> - __field(size_t, buffer_length)
> + __field(unsigned int, length)
> __field(unsigned, flags)
> __field(int, hold)
> __field(int, pincount)
> @@ -502,7 +502,7 @@ TRACE_EVENT(xfs_buf_ioerror,
> TP_fast_assign(
> __entry->dev = bp->b_target->bt_dev;
> __entry->bno = bp->b_bn;
> - __entry->buffer_length = BBTOB(bp->b_length);
> + __entry->length = bp->b_length;
> __entry->hold = atomic_read(&bp->b_hold);
> __entry->pincount = atomic_read(&bp->b_pin_count);
> __entry->lockval = bp->b_sema.count;
> @@ -510,11 +510,11 @@ TRACE_EVENT(xfs_buf_ioerror,
> __entry->flags = bp->b_flags;
> __entry->caller_ip = caller_ip;
> ),
> - TP_printk("dev %d:%d daddr 0x%llx len 0x%zx hold %d pincount %d "
> + TP_printk("dev %d:%d daddr 0x%llx daddrcount 0x%x hold %d pincount %d "
> "lock %d error %d flags %s caller %pS",
> MAJOR(__entry->dev), MINOR(__entry->dev),
> (unsigned long long)__entry->bno,
> - __entry->buffer_length,
> + __entry->length,
> __entry->hold,
> __entry->pincount,
> __entry->lockval,
> @@ -529,7 +529,7 @@ DECLARE_EVENT_CLASS(xfs_buf_item_class,
> TP_STRUCT__entry(
> __field(dev_t, dev)
> __field(xfs_daddr_t, buf_bno)
> - __field(size_t, buf_len)
> + __field(unsigned int, buf_len)
> __field(int, buf_hold)
> __field(int, buf_pincount)
> __field(int, buf_lockval)
> @@ -545,14 +545,14 @@ DECLARE_EVENT_CLASS(xfs_buf_item_class,
> __entry->bli_recur = bip->bli_recur;
> __entry->bli_refcount = atomic_read(&bip->bli_refcount);
> __entry->buf_bno = bip->bli_buf->b_bn;
> - __entry->buf_len = BBTOB(bip->bli_buf->b_length);
> + __entry->buf_len = bip->bli_buf->b_length;
> __entry->buf_flags = bip->bli_buf->b_flags;
> __entry->buf_hold = atomic_read(&bip->bli_buf->b_hold);
> __entry->buf_pincount = atomic_read(&bip->bli_buf->b_pin_count);
> __entry->buf_lockval = bip->bli_buf->b_sema.count;
> __entry->li_flags = bip->bli_item.li_flags;
> ),
> - TP_printk("dev %d:%d daddr 0x%llx len 0x%zx hold %d pincount %d "
> + TP_printk("dev %d:%d daddr 0x%llx daddrcount 0x%x hold %d pincount %d "
> "lock %d flags %s recur %d refcount %d bliflags %s "
> "liflags %s",
> MAJOR(__entry->dev), MINOR(__entry->dev),
>
--
Carlos
