From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 089E5C432BE for ; Thu, 19 Aug 2021 08:46:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DDD8661106 for ; Thu, 19 Aug 2021 08:46:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237218AbhHSIqh (ORCPT ); Thu, 19 Aug 2021 04:46:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:46462 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237127AbhHSIqf (ORCPT ); Thu, 19 Aug 2021 04:46:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629362758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=VzLD/HFaqbMTmkF71+DIfYdubaq5Q0igEep0gqiwUWI=; b=ifZdt87vUwEioqKmWNwYoRw64E8sPpp0fmK6KQUDdxuOZPbIdaP1rfEL8YlbSC7pG/sXuT 9H6hyMP8grsOeDE25GioR1yUgTQmYwcwUob639K32OwUlDtXhWML0hBRBysr3QZgjmYe5h QvAFjSc5lTVN4qYl39NwT9z2uN4OH6M= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-48-kzvZMBvXPMmKbZ7dx8C-rg-1; Thu, 19 Aug 2021 04:45:54 -0400 X-MC-Unique: kzvZMBvXPMmKbZ7dx8C-rg-1 Received: by mail-ej1-f71.google.com with SMTP id r21-20020a1709067055b02904be5f536463so1985388ejj.0 for ; Thu, 19 Aug 2021 01:45:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=VzLD/HFaqbMTmkF71+DIfYdubaq5Q0igEep0gqiwUWI=; b=mwbT2HK8qSfw1sz7gVDoZHK8R+k2JfD7TCe9iZzIDi5al4IV18M6VmDAI60X3dVsZY TcT3yUcoFmWy17x5ZLGidXJ46sfXegPhyMeybiqao0JQnML+ifYLvMlav/LFpekiiKRQ QBr9iCVJ/wO0D5c3Ktxy9BrvGN8VC1c4RWf9RR4tpl9VxY5hY+un5WexVcV/xazNEtMf te86N66Xiy1LtWPZpEuS6+MhFqwi9+pVMBhqsV3ASoSrU5wvDW6nw8V6tt35oxPTtuqu 0WbKZufJ1imIl/Yx5/p6EIMDV+oTHpJBQH3J3MM8gguQ7KFEKXd/qN4+lDPydShsMK+3 CGYQ== X-Gm-Message-State: AOAM530iCIWa+F93DBjufiya+5a2MxSYZ0aREtbxPSVteLgQZBsce5+q lwudp0kiMH2REcXq9mMiYGBy9HTeP4NyP+Ap79czX3Pn7xHhEp4hSPXo+GYX3cBROR95d3qjKkN ad/oUED10ukt4obmbeI9x X-Received: by 2002:a17:906:3fd7:: with SMTP id k23mr14583762ejj.176.1629362753298; Thu, 19 Aug 2021 01:45:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwtRJ7d7fZEyvZjNrUUJlGSednLHbBYeuL1WkCoheW3uKc5bgV7ewpIrqgULcaGlQ8Ejv1Xw== X-Received: by 2002:a17:906:3fd7:: with SMTP id k23mr14583741ejj.176.1629362752995; Thu, 19 Aug 2021 01:45:52 -0700 (PDT) Received: from omega.lan (ip4-46-39-172-19.cust.nbox.cz. [46.39.172.19]) by smtp.gmail.com with ESMTPSA id c9sm1384077ede.40.2021.08.19.01.45.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 01:45:52 -0700 (PDT) Date: Thu, 19 Aug 2021 10:45:50 +0200 From: Carlos Maiolino To: "Darrick J. Wong" Cc: david@fromorbit.com, sandeen@sandeen.net, linux-xfs@vger.kernel.org Subject: Re: [PATCH 03/15] xfs: standardize AG number formatting in ftrace output Message-ID: <20210819084550.vsviu62eumjhgdy6@omega.lan> Mail-Followup-To: "Darrick J. Wong" , david@fromorbit.com, sandeen@sandeen.net, linux-xfs@vger.kernel.org References: <162924373176.761813.10896002154570305865.stgit@magnolia> <162924374855.761813.3505702511699510019.stgit@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <162924374855.761813.3505702511699510019.stgit@magnolia> Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Tue, Aug 17, 2021 at 04:42:28PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong > > Always print allocation group numbers in hexadecimal and preceded with > the unit "agno". > > Signed-off-by: Darrick J. Wong Reviewed-by: Carlos Maiolino > --- > fs/xfs/scrub/trace.h | 34 ++++++++++++------------ > fs/xfs/xfs_trace.h | 72 +++++++++++++++++++++++++------------------------- > 2 files changed, 53 insertions(+), 53 deletions(-) > > > diff --git a/fs/xfs/scrub/trace.h b/fs/xfs/scrub/trace.h > index e6e70d5870a2..3676b1736bab 100644 > --- a/fs/xfs/scrub/trace.h > +++ b/fs/xfs/scrub/trace.h > @@ -103,7 +103,7 @@ DECLARE_EVENT_CLASS(xchk_class, > __entry->flags = sm->sm_flags; > __entry->error = error; > ), > - TP_printk("dev %d:%d ino 0x%llx type %s agno %u inum 0x%llx gen %u flags 0x%x error %d", > + TP_printk("dev %d:%d ino 0x%llx type %s agno 0x%x inum 0x%llx gen %u flags 0x%x error %d", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->ino, > __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS), > @@ -145,7 +145,7 @@ TRACE_EVENT(xchk_op_error, > __entry->error = error; > __entry->ret_ip = ret_ip; > ), > - TP_printk("dev %d:%d type %s agno %u agbno %u error %d ret_ip %pS", > + TP_printk("dev %d:%d type %s agno 0x%x agbno %u error %d ret_ip %pS", > MAJOR(__entry->dev), MINOR(__entry->dev), > __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS), > __entry->agno, > @@ -203,7 +203,7 @@ DECLARE_EVENT_CLASS(xchk_block_error_class, > __entry->agbno = xfs_daddr_to_agbno(sc->mp, daddr); > __entry->ret_ip = ret_ip; > ), > - TP_printk("dev %d:%d type %s agno %u agbno %u ret_ip %pS", > + TP_printk("dev %d:%d type %s agno 0x%x agbno %u ret_ip %pS", > MAJOR(__entry->dev), MINOR(__entry->dev), > __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS), > __entry->agno, > @@ -338,7 +338,7 @@ TRACE_EVENT(xchk_btree_op_error, > __entry->error = error; > __entry->ret_ip = ret_ip; > ), > - TP_printk("dev %d:%d type %s btree %s level %d ptr %d agno %u agbno %u error %d ret_ip %pS", > + TP_printk("dev %d:%d type %s btree %s level %d ptr %d agno 0x%x agbno %u error %d ret_ip %pS", > MAJOR(__entry->dev), MINOR(__entry->dev), > __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS), > __print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS), > @@ -381,7 +381,7 @@ TRACE_EVENT(xchk_ifork_btree_op_error, > __entry->error = error; > __entry->ret_ip = ret_ip; > ), > - TP_printk("dev %d:%d ino 0x%llx fork %d type %s btree %s level %d ptr %d agno %u agbno %u error %d ret_ip %pS", > + TP_printk("dev %d:%d ino 0x%llx fork %d type %s btree %s level %d ptr %d agno 0x%x agbno %u error %d ret_ip %pS", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->ino, > __entry->whichfork, > @@ -420,7 +420,7 @@ TRACE_EVENT(xchk_btree_error, > __entry->ptr = cur->bc_ptrs[level]; > __entry->ret_ip = ret_ip; > ), > - TP_printk("dev %d:%d type %s btree %s level %d ptr %d agno %u agbno %u ret_ip %pS", > + TP_printk("dev %d:%d type %s btree %s level %d ptr %d agno 0x%x agbno %u ret_ip %pS", > MAJOR(__entry->dev), MINOR(__entry->dev), > __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS), > __print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS), > @@ -460,7 +460,7 @@ TRACE_EVENT(xchk_ifork_btree_error, > __entry->ptr = cur->bc_ptrs[level]; > __entry->ret_ip = ret_ip; > ), > - TP_printk("dev %d:%d ino 0x%llx fork %d type %s btree %s level %d ptr %d agno %u agbno %u ret_ip %pS", > + TP_printk("dev %d:%d ino 0x%llx fork %d type %s btree %s level %d ptr %d agno 0x%x agbno %u ret_ip %pS", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->ino, > __entry->whichfork, > @@ -499,7 +499,7 @@ DECLARE_EVENT_CLASS(xchk_sbtree_class, > __entry->nlevels = cur->bc_nlevels; > __entry->ptr = cur->bc_ptrs[level]; > ), > - TP_printk("dev %d:%d type %s btree %s agno %u agbno %u level %d nlevels %d ptr %d", > + TP_printk("dev %d:%d type %s btree %s agno 0x%x agbno %u level %d nlevels %d ptr %d", > MAJOR(__entry->dev), MINOR(__entry->dev), > __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS), > __print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS), > @@ -572,7 +572,7 @@ TRACE_EVENT(xchk_iallocbt_check_cluster, > __entry->holemask = holemask; > __entry->cluster_ino = cluster_ino; > ), > - TP_printk("dev %d:%d agno %d startino 0x%x daddr 0x%llx len %d chunkino 0x%x nr_inodes %u cluster_mask 0x%x holemask 0x%x cluster_ino 0x%x", > + TP_printk("dev %d:%d agno 0x%x startino 0x%x daddr 0x%llx len %d chunkino 0x%x nr_inodes %u cluster_mask 0x%x holemask 0x%x cluster_ino 0x%x", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->startino, > @@ -662,7 +662,7 @@ DECLARE_EVENT_CLASS(xrep_extent_class, > __entry->agbno = agbno; > __entry->len = len; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u", > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->agbno, > @@ -699,7 +699,7 @@ DECLARE_EVENT_CLASS(xrep_rmap_class, > __entry->offset = offset; > __entry->flags = flags; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u owner %lld offset %llu flags 0x%x", > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u owner %lld offset %llu flags 0x%x", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->agbno, > @@ -737,7 +737,7 @@ TRACE_EVENT(xrep_refcount_extent_fn, > __entry->blockcount = irec->rc_blockcount; > __entry->refcount = irec->rc_refcount; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u", > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u refcount %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->startblock, > @@ -761,7 +761,7 @@ TRACE_EVENT(xrep_init_btblock, > __entry->agbno = agbno; > __entry->btnum = btnum; > ), > - TP_printk("dev %d:%d agno %u agbno %u btree %s", > + TP_printk("dev %d:%d agno 0x%x agbno %u btree %s", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->agbno, > @@ -785,7 +785,7 @@ TRACE_EVENT(xrep_findroot_block, > __entry->magic = magic; > __entry->level = level; > ), > - TP_printk("dev %d:%d agno %u agbno %u magic 0x%x level %u", > + TP_printk("dev %d:%d agno 0x%x agbno %u magic 0x%x level %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->agbno, > @@ -813,7 +813,7 @@ TRACE_EVENT(xrep_calc_ag_resblks, > __entry->freelen = freelen; > __entry->usedlen = usedlen; > ), > - TP_printk("dev %d:%d agno %d icount %u aglen %u freelen %u usedlen %u", > + TP_printk("dev %d:%d agno 0x%x icount %u aglen %u freelen %u usedlen %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->icount, > @@ -842,7 +842,7 @@ TRACE_EVENT(xrep_calc_ag_resblks_btsize, > __entry->rmapbt_sz = rmapbt_sz; > __entry->refcbt_sz = refcbt_sz; > ), > - TP_printk("dev %d:%d agno %d bnobt %u inobt %u rmapbt %u refcountbt %u", > + TP_printk("dev %d:%d agno 0x%x bnobt %u inobt %u rmapbt %u refcountbt %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->bnobt_sz, > @@ -886,7 +886,7 @@ TRACE_EVENT(xrep_ialloc_insert, > __entry->freecount = freecount; > __entry->freemask = freemask; > ), > - TP_printk("dev %d:%d agno %d startino 0x%x holemask 0x%x count %u freecount %u freemask 0x%llx", > + TP_printk("dev %d:%d agno 0x%x startino 0x%x holemask 0x%x count %u freecount %u freemask 0x%llx", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->startino, > diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h > index 6b2d4c5205d8..9ddc710c1be9 100644 > --- a/fs/xfs/xfs_trace.h > +++ b/fs/xfs/xfs_trace.h > @@ -139,7 +139,7 @@ DECLARE_EVENT_CLASS(xfs_perag_class, > __entry->refcount = refcount; > __entry->caller_ip = caller_ip; > ), > - TP_printk("dev %d:%d agno %u refcount %d caller %pS", > + TP_printk("dev %d:%d agno 0x%x refcount %d caller %pS", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->refcount, > @@ -246,7 +246,7 @@ DECLARE_EVENT_CLASS(xfs_ag_class, > __entry->dev = mp->m_super->s_dev; > __entry->agno = agno; > ), > - TP_printk("dev %d:%d agno %u", > + TP_printk("dev %d:%d agno 0x%x", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno) > ); > @@ -612,7 +612,7 @@ DECLARE_EVENT_CLASS(xfs_filestream_class, > __entry->agno = agno; > __entry->streams = xfs_filestream_peek_ag(mp, agno); > ), > - TP_printk("dev %d:%d ino 0x%llx agno %u streams %d", > + TP_printk("dev %d:%d ino 0x%llx agno 0x%x streams %d", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->ino, > __entry->agno, > @@ -646,7 +646,7 @@ TRACE_EVENT(xfs_filestream_pick, > __entry->free = free; > __entry->nscan = nscan; > ), > - TP_printk("dev %d:%d ino 0x%llx agno %u streams %d free %d nscan %d", > + TP_printk("dev %d:%d ino 0x%llx agno 0x%x streams %d free %d nscan %d", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->ino, > __entry->agno, > @@ -858,7 +858,7 @@ TRACE_EVENT(xfs_irec_merge_pre, > __entry->nagino = nagino; > __entry->nholemask = holemask; > ), > - TP_printk("dev %d:%d agno %d inobt (%u:0x%x) new (%u:0x%x)", > + TP_printk("dev %d:%d agno 0x%x inobt (%u:0x%x) new (%u:0x%x)", > MAJOR(__entry->dev), MINOR(__entry->dev), __entry->agno, > __entry->agino, __entry->holemask, __entry->nagino, > __entry->nholemask) > @@ -880,7 +880,7 @@ TRACE_EVENT(xfs_irec_merge_post, > __entry->agino = agino; > __entry->holemask = holemask; > ), > - TP_printk("dev %d:%d agno %d inobt (%u:0x%x)", MAJOR(__entry->dev), > + TP_printk("dev %d:%d agno 0x%x inobt (%u:0x%x)", MAJOR(__entry->dev), > MINOR(__entry->dev), __entry->agno, __entry->agino, > __entry->holemask) > ) > @@ -1601,7 +1601,7 @@ DECLARE_EVENT_CLASS(xfs_extent_busy_class, > __entry->agbno = agbno; > __entry->len = len; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u", > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->agbno, > @@ -1639,7 +1639,7 @@ TRACE_EVENT(xfs_extent_busy_trim, > __entry->tbno = tbno; > __entry->tlen = tlen; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u tbno %u tlen %u", > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u tbno %u tlen %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->agbno, > @@ -1686,7 +1686,7 @@ DECLARE_EVENT_CLASS(xfs_agf_class, > __entry->longest = be32_to_cpu(agf->agf_longest); > __entry->caller_ip = caller_ip; > ), > - TP_printk("dev %d:%d agno %u flags %s length %u roots b %u c %u " > + TP_printk("dev %d:%d agno 0x%x flags %s length %u roots b %u c %u " > "levels b %u c %u flfirst %u fllast %u flcount %u " > "freeblks %u longest %u caller %pS", > MAJOR(__entry->dev), MINOR(__entry->dev), > @@ -1735,7 +1735,7 @@ TRACE_EVENT(xfs_free_extent, > __entry->haveleft = haveleft; > __entry->haveright = haveright; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u resv %d %s", > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u resv %d %s", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->agbno, > @@ -1792,7 +1792,7 @@ DECLARE_EVENT_CLASS(xfs_alloc_class, > __entry->datatype = args->datatype; > __entry->firstblock = args->tp->t_firstblock; > ), > - TP_printk("dev %d:%d agno %u agbno %u minlen %u maxlen %u mod %u " > + TP_printk("dev %d:%d agno 0x%x agbno %u minlen %u maxlen %u mod %u " > "prod %u minleft %u total %u alignment %u minalignslop %u " > "len %u type %s otype %s wasdel %d wasfromfl %d resv %d " > "datatype 0x%x firstblock 0x%llx", > @@ -2363,7 +2363,7 @@ DECLARE_EVENT_CLASS(xfs_log_recover_icreate_item_class, > __entry->length = be32_to_cpu(in_f->icl_length); > __entry->gen = be32_to_cpu(in_f->icl_gen); > ), > - TP_printk("dev %d:%d agno %u agbno %u count %u isize %u length %u " > + TP_printk("dev %d:%d agno 0x%x agbno %u count %u isize %u length %u " > "gen %u", MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, __entry->agbno, __entry->count, __entry->isize, > __entry->length, __entry->gen) > @@ -2392,7 +2392,7 @@ DECLARE_EVENT_CLASS(xfs_discard_class, > __entry->agbno = agbno; > __entry->len = len; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u", > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->agbno, > @@ -2551,7 +2551,7 @@ DECLARE_EVENT_CLASS(xfs_phys_extent_deferred_class, > __entry->agbno = agbno; > __entry->len = len; > ), > - TP_printk("dev %d:%d op %d agno %u agbno %u len %u", > + TP_printk("dev %d:%d op %d agno 0x%x agbno %u len %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->type, > __entry->agno, > @@ -2598,7 +2598,7 @@ DECLARE_EVENT_CLASS(xfs_map_extent_deferred_class, > __entry->l_state = state; > __entry->op = op; > ), > - TP_printk("dev %d:%d op %d agno %u agbno %u owner %lld %s offset %llu len %llu state %d", > + TP_printk("dev %d:%d op %d agno 0x%x agbno %u owner %lld %s offset %llu len %llu state %d", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->op, > __entry->agno, > @@ -2668,7 +2668,7 @@ DECLARE_EVENT_CLASS(xfs_rmap_class, > if (unwritten) > __entry->flags |= XFS_RMAP_UNWRITTEN; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u owner %lld offset %llu flags 0x%lx", > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u owner %lld offset %llu flags 0x%lx", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->agbno, > @@ -2701,7 +2701,7 @@ DECLARE_EVENT_CLASS(xfs_ag_error_class, > __entry->error = error; > __entry->caller_ip = caller_ip; > ), > - TP_printk("dev %d:%d agno %u error %d caller %pS", > + TP_printk("dev %d:%d agno 0x%x error %d caller %pS", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->error, > @@ -2748,7 +2748,7 @@ DECLARE_EVENT_CLASS(xfs_rmapbt_class, > __entry->offset = offset; > __entry->flags = flags; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u owner %lld offset %llu flags 0x%x", > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u owner %lld offset %llu flags 0x%x", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->agbno, > @@ -2817,7 +2817,7 @@ DECLARE_EVENT_CLASS(xfs_ag_resv_class, > __entry->asked = r ? r->ar_asked : 0; > __entry->len = len; > ), > - TP_printk("dev %d:%d agno %u resv %d freeblks %u flcount %u " > + TP_printk("dev %d:%d agno 0x%x resv %d freeblks %u flcount %u " > "resv %u ask %u len %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > @@ -2870,7 +2870,7 @@ DECLARE_EVENT_CLASS(xfs_ag_btree_lookup_class, > __entry->agbno = agbno; > __entry->dir = dir; > ), > - TP_printk("dev %d:%d agno %u agbno %u cmp %s(%d)", > + TP_printk("dev %d:%d agno 0x%x agbno %u cmp %s(%d)", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->agbno, > @@ -2903,7 +2903,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_extent_class, > __entry->blockcount = irec->rc_blockcount; > __entry->refcount = irec->rc_refcount; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u", > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u refcount %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->startblock, > @@ -2938,7 +2938,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_extent_at_class, > __entry->refcount = irec->rc_refcount; > __entry->agbno = agbno; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u @ agbno %u", > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u refcount %u @ agbno %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->startblock, > @@ -2978,7 +2978,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_double_extent_class, > __entry->i2_blockcount = i2->rc_blockcount; > __entry->i2_refcount = i2->rc_refcount; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u -- " > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u refcount %u -- " > "agbno %u len %u refcount %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > @@ -3024,7 +3024,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_double_extent_at_class, > __entry->i2_refcount = i2->rc_refcount; > __entry->agbno = agbno; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u -- " > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u refcount %u -- " > "agbno %u len %u refcount %u @ agbno %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > @@ -3076,7 +3076,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_triple_extent_class, > __entry->i3_blockcount = i3->rc_blockcount; > __entry->i3_refcount = i3->rc_refcount; > ), > - TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u -- " > + TP_printk("dev %d:%d agno 0x%x agbno %u len %u refcount %u -- " > "agbno %u len %u refcount %u -- " > "agbno %u len %u refcount %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > @@ -3165,7 +3165,7 @@ TRACE_EVENT(xfs_refcount_finish_one_leftover, > __entry->new_agbno = new_agbno; > __entry->new_len = new_len; > ), > - TP_printk("dev %d:%d type %d agno %u agbno %u len %u new_agbno %u new_len %u", > + TP_printk("dev %d:%d type %d agno 0x%x agbno %u len %u new_agbno %u new_len %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->type, > __entry->agno, > @@ -3417,7 +3417,7 @@ DECLARE_EVENT_CLASS(xfs_fsmap_class, > __entry->offset = rmap->rm_offset; > __entry->flags = rmap->rm_flags; > ), > - TP_printk("dev %d:%d keydev %d:%d agno %u bno %llu len %llu owner %lld offset %llu flags 0x%x", > + TP_printk("dev %d:%d keydev %d:%d agno 0x%x bno %llu len %llu owner %lld offset %llu flags 0x%x", > MAJOR(__entry->dev), MINOR(__entry->dev), > MAJOR(__entry->keydev), MINOR(__entry->keydev), > __entry->agno, > @@ -3556,7 +3556,7 @@ TRACE_EVENT(xfs_iunlink_update_bucket, > __entry->old_ptr = old_ptr; > __entry->new_ptr = new_ptr; > ), > - TP_printk("dev %d:%d agno %u bucket %u old 0x%x new 0x%x", > + TP_printk("dev %d:%d agno 0x%x bucket %u old 0x%x new 0x%x", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->bucket, > @@ -3582,7 +3582,7 @@ TRACE_EVENT(xfs_iunlink_update_dinode, > __entry->old_ptr = old_ptr; > __entry->new_ptr = new_ptr; > ), > - TP_printk("dev %d:%d agno %u agino 0x%x old 0x%x new 0x%x", > + TP_printk("dev %d:%d agno 0x%x agino 0x%x old 0x%x new 0x%x", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, > __entry->agino, > @@ -3603,7 +3603,7 @@ DECLARE_EVENT_CLASS(xfs_ag_inode_class, > __entry->agno = XFS_INO_TO_AGNO(ip->i_mount, ip->i_ino); > __entry->agino = XFS_INO_TO_AGINO(ip->i_mount, ip->i_ino); > ), > - TP_printk("dev %d:%d agno %u agino 0x%x", > + TP_printk("dev %d:%d agno 0x%x agino 0x%x", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, __entry->agino) > ) > @@ -3655,7 +3655,7 @@ DECLARE_EVENT_CLASS(xfs_ag_corrupt_class, > __entry->agno = agno; > __entry->flags = flags; > ), > - TP_printk("dev %d:%d agno %u flags 0x%x", > + TP_printk("dev %d:%d agno 0x%x flags 0x%x", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->agno, __entry->flags) > ); > @@ -3706,7 +3706,7 @@ TRACE_EVENT(xfs_iwalk_ag, > __entry->agno = agno; > __entry->startino = startino; > ), > - TP_printk("dev %d:%d agno %d startino 0x%x", > + TP_printk("dev %d:%d agno 0x%x startino 0x%x", > MAJOR(__entry->dev), MINOR(__entry->dev), __entry->agno, > __entry->startino) > ) > @@ -3727,7 +3727,7 @@ TRACE_EVENT(xfs_iwalk_ag_rec, > __entry->startino = irec->ir_startino; > __entry->freemask = irec->ir_free; > ), > - TP_printk("dev %d:%d agno %d startino 0x%x freemask 0x%llx", > + TP_printk("dev %d:%d agno 0x%x startino 0x%x freemask 0x%llx", > MAJOR(__entry->dev), MINOR(__entry->dev), __entry->agno, > __entry->startino, __entry->freemask) > ) > @@ -3815,7 +3815,7 @@ TRACE_EVENT(xfs_btree_commit_afakeroot, > __entry->levels = cur->bc_ag.afake->af_levels; > __entry->blocks = cur->bc_ag.afake->af_blocks; > ), > - TP_printk("dev %d:%d btree %s ag %u levels %u blocks %u root %u", > + TP_printk("dev %d:%d btree %s agno 0x%x levels %u blocks %u root %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS), > __entry->agno, > @@ -3847,7 +3847,7 @@ TRACE_EVENT(xfs_btree_commit_ifakeroot, > __entry->blocks = cur->bc_ino.ifake->if_blocks; > __entry->whichfork = cur->bc_ino.whichfork; > ), > - TP_printk("dev %d:%d btree %s ag %u agino 0x%x whichfork %s levels %u blocks %u", > + TP_printk("dev %d:%d btree %s agno 0x%x agino 0x%x whichfork %s levels %u blocks %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS), > __entry->agno, > @@ -3930,7 +3930,7 @@ TRACE_EVENT(xfs_btree_bload_block, > } > __entry->nr_records = nr_records; > ), > - TP_printk("dev %d:%d btree %s level %u block %llu/%llu fsb (%u/%u) recs %u", > + TP_printk("dev %d:%d btree %s level %u block %llu/%llu agno 0x%x agbno %u recs %u", > MAJOR(__entry->dev), MINOR(__entry->dev), > __print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS), > __entry->level, > -- Carlos