On 11/28/18 5:29 PM, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > > Use __print_symbolic to print the scrub type in ftrace output. > > Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > --- > fs/xfs/scrub/trace.h | 103 +++++++++++++++++++++++++++++++++++++------------- > 1 file changed, 77 insertions(+), 26 deletions(-) > > > diff --git a/fs/xfs/scrub/trace.h b/fs/xfs/scrub/trace.h > index 0141eb1ac091..3c83e8b3b39c 100644 > --- a/fs/xfs/scrub/trace.h > +++ b/fs/xfs/scrub/trace.h > @@ -26,6 +26,57 @@ TRACE_DEFINE_ENUM(XFS_BTNUM_FINOi); > TRACE_DEFINE_ENUM(XFS_BTNUM_RMAPi); > TRACE_DEFINE_ENUM(XFS_BTNUM_REFCi); > > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_PROBE); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_SB); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_AGF); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_AGFL); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_AGI); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_BNOBT); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_CNTBT); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_INOBT); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_FINOBT); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_RMAPBT); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_REFCNTBT); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_INODE); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_BMBTD); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_BMBTA); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_BMBTC); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_DIR); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_XATTR); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_SYMLINK); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_PARENT); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_RTBITMAP); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_RTSUM); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_UQUOTA); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_GQUOTA); > +TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_PQUOTA); > + > +#define XFS_SCRUB_TYPE_STRINGS \ Hm I thought you just moved these sorts of #defines /out/ of the trace files and adjacent to their type definitions in core header files; why not this one? > + { XFS_SCRUB_TYPE_PROBE, "probe" }, \ > + { XFS_SCRUB_TYPE_SB, "sb" }, \ > + { XFS_SCRUB_TYPE_AGF, "agf" }, \ > + { XFS_SCRUB_TYPE_AGFL, "agfl" }, \ > + { XFS_SCRUB_TYPE_AGI, "agi" }, \ > + { XFS_SCRUB_TYPE_BNOBT, "bnobt" }, \ -Eric