From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from userp2130.oracle.com ([156.151.31.86]:39066 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750995AbdLDX4S (ORCPT ); Mon, 4 Dec 2017 18:56:18 -0500 Date: Mon, 4 Dec 2017 15:56:13 -0800 From: "Darrick J. Wong" Subject: Re: [PATCH 1/5 V2] xfs_db: print structure padding fields consistently Message-ID: <20171204235613.GB19219@magnolia> References: <151094860143.27182.12022983202520916281.stgit@magnolia> <151094860737.27182.5422098949147661107.stgit@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: Eric Sandeen Cc: sandeen@redhat.com, linux-xfs@vger.kernel.org On Mon, Dec 04, 2017 at 05:54:09PM -0600, Eric Sandeen wrote: > From: Darrick J. Wong > > We are very inconsistent about how we print padding fields in on-disk > structures -- sometimes we hide it from printall, sometimes we deviate > from unsigned hex values, etc. Make this all consistent -- always hide > padding values when printing the whole structure, always print them as > unsigned hex integers when explicitly requested. > > Signed-off-by: Darrick J. Wong > [sandeen: switch to never-print instead of always-print] Looks ok, Reviewed-by: Darrick J. Wong > Reviewed-by: Eric Sandeen > Signed-off-by: Eric Sandeen > --- > > V2: constant-ify by never printing instead of always printing, > but still make format consistent. > > diff --git a/db/attr.c b/db/attr.c > index 75fe239..9cbb20d 100644 > --- a/db/attr.c > +++ b/db/attr.c > @@ -589,7 +589,7 @@ const field_t attr3_node_hdr_flds[] = { > { "info", FLDT_ATTR3_BLKINFO, OI(H3OFF(info)), C1, 0, TYP_NONE }, > { "count", FLDT_UINT16D, OI(H3OFF(__count)), C1, 0, TYP_NONE }, > { "level", FLDT_UINT16D, OI(H3OFF(__level)), C1, 0, TYP_NONE }, > - { "pad", FLDT_UINT32D, OI(H3OFF(__pad32)), C1, 0, TYP_NONE }, > + { "pad", FLDT_UINT32X, OI(H3OFF(__pad32)), C1, FLD_SKIPALL, TYP_NONE }, > { NULL } > }; > > diff --git a/db/dir2.c b/db/dir2.c > index 3e21a7b..7f7ea5a 100644 > --- a/db/dir2.c > +++ b/db/dir2.c > @@ -977,7 +977,7 @@ const field_t da3_node_hdr_flds[] = { > { "info", FLDT_DA3_BLKINFO, OI(H3OFF(info)), C1, 0, TYP_NONE }, > { "count", FLDT_UINT16D, OI(H3OFF(__count)), C1, 0, TYP_NONE }, > { "level", FLDT_UINT16D, OI(H3OFF(__level)), C1, 0, TYP_NONE }, > - { "pad", FLDT_UINT32D, OI(H3OFF(__pad32)), C1, 0, TYP_NONE }, > + { "pad", FLDT_UINT32X, OI(H3OFF(__pad32)), C1, FLD_SKIPALL, TYP_NONE }, > { NULL } > }; > > diff --git a/db/dquot.c b/db/dquot.c > index 4e35df4..4fd1289 100644 > --- a/db/dquot.c > +++ b/db/dquot.c > @@ -76,7 +76,7 @@ const field_t disk_dquot_flds[] = { > { "btimer", FLDT_INT32D, OI(DOFF(btimer)), C1, 0, TYP_NONE }, > { "iwarns", FLDT_QWARNCNT, OI(DOFF(iwarns)), C1, 0, TYP_NONE }, > { "bwarns", FLDT_QWARNCNT, OI(DOFF(bwarns)), C1, 0, TYP_NONE }, > - { "pad0", FLDT_INT32D, OI(DOFF(pad0)), C1, FLD_SKIPALL, TYP_NONE }, > + { "pad0", FLDT_UINT32X, OI(DOFF(pad0)), C1, FLD_SKIPALL, TYP_NONE }, > { "rtb_hardlimit", FLDT_QCNT, OI(DOFF(rtb_hardlimit)), C1, 0, > TYP_NONE }, > { "rtb_softlimit", FLDT_QCNT, OI(DOFF(rtb_softlimit)), C1, 0, > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html