From: Kent Overstreet Date: Sat, 25 Feb 2023 00:06:32 +0000 (-0500) Subject: bcachefs: Make bucket_alloc tracepoint more readable X-Git-Tag: io_uring-6.7-2023-11-10~119^2~477 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1a14e255100cb17cface9ca179ca7ddba87fd8b9;p=linux-block.git bcachefs: Make bucket_alloc tracepoint more readable Print bucket in dev:bucket notation, to be consistent with how we refer to buckets elsewhere. Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/trace.h b/fs/bcachefs/trace.h index f608baec294a..aae04d0619be 100644 --- a/fs/bcachefs/trace.h +++ b/fs/bcachefs/trace.h @@ -530,7 +530,7 @@ DECLARE_EVENT_CLASS(bucket_alloc, s, nonblocking, err), TP_STRUCT__entry( - __field(dev_t, dev ) + __field(u8, dev ) __array(char, reserve, 16 ) __field(bool, user ) __field(u64, bucket ) @@ -548,7 +548,7 @@ DECLARE_EVENT_CLASS(bucket_alloc, ), TP_fast_assign( - __entry->dev = ca->dev; + __entry->dev = ca->dev_idx; strscpy(__entry->reserve, alloc_reserve, sizeof(__entry->reserve)); __entry->user = user; __entry->bucket = bucket; @@ -565,10 +565,10 @@ DECLARE_EVENT_CLASS(bucket_alloc, strscpy(__entry->err, err, sizeof(__entry->err)); ), - TP_printk("%d,%d reserve %s user %u bucket %llu free %llu avail %llu copygc_wait %llu/%lli seen %llu open %llu need_journal_commit %llu nouse %llu nocow %llu nonblocking %u err %s", - MAJOR(__entry->dev), MINOR(__entry->dev), + TP_printk("reserve %s user %u bucket %u:%llu free %llu avail %llu copygc_wait %llu/%lli seen %llu open %llu need_journal_commit %llu nouse %llu nocow %llu nonblocking %u err %s", __entry->reserve, __entry->user, + __entry->dev, __entry->bucket, __entry->free, __entry->avail,