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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY 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 E8B0BC433DF for ; Mon, 22 Jun 2020 17:16:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C2BA520732 for ; Mon, 22 Jun 2020 17:16:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="ito3xPTZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729777AbgFVRQB (ORCPT ); Mon, 22 Jun 2020 13:16:01 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:46842 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729605AbgFVRQB (ORCPT ); Mon, 22 Jun 2020 13:16:01 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 05MHBbVx189489; Mon, 22 Jun 2020 17:15:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2020-01-29; bh=OSgGowDIDtLo3rxQLlrQ1JxXYQ4YyzJgFy3mbDF2MMY=; b=ito3xPTZwtU97Q3bLEnCQFR5j+r9AA93Hc/V4noqCvt2LdjvsP7fAH0urlC80nkuGsHa bQ8eWUYf9jGHCsk80Z7j3vvS0w+2jdWsEkhGpKmBkh8PMVoNNta2E36F+amG/XiaYYYQ NKScBAucKPURNW4PD4RS9Q6B6PIOeHknwjtDHt2npJJtG/Y5TbxC9H6GGaIXOLCId/Sj 6wdf1EGPTUNxmarUZyMOr6yHryuQ00TsexS5Fqip3c40CFUMPyzqIE/beOez+PjoTgk+ 8m2lkWbHKrFLYwB9VjN9Hq97LUTmza88MNvKVLLrVlOfOATMDwFL+aGuSVyb98oykzAE DQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2120.oracle.com with ESMTP id 31sebb8p42-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 22 Jun 2020 17:15:56 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 05MHD5Hw113251; Mon, 22 Jun 2020 17:15:56 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userp3030.oracle.com with ESMTP id 31svcvd7p3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Jun 2020 17:15:56 +0000 Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 05MHFtcT006565; Mon, 22 Jun 2020 17:15:55 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 22 Jun 2020 17:15:55 +0000 Date: Mon, 22 Jun 2020 10:15:54 -0700 From: "Darrick J. Wong" To: Carlos Maiolino Cc: linux-xfs@vger.kernel.org Subject: Re: [PATCH 1/2] xfs: Fix xfs_mount sunit and swidth types Message-ID: <20200622171554.GF11245@magnolia> References: <20200601140153.200864-1-cmaiolino@redhat.com> <20200601140153.200864-2-cmaiolino@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200601140153.200864-2-cmaiolino@redhat.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9660 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 adultscore=0 malwarescore=0 suspectscore=1 phishscore=0 mlxscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2006220120 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9660 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 cotscore=-2147483648 lowpriorityscore=0 phishscore=0 bulkscore=0 clxscore=1011 impostorscore=0 malwarescore=0 priorityscore=1501 spamscore=0 mlxscore=0 adultscore=0 suspectscore=1 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2006220120 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Mon, Jun 01, 2020 at 04:01:52PM +0200, Carlos Maiolino wrote: > The sunit (mp->m_dalign) and swidth (mp->m_swidth) are currently encoded > as int in the xfs_mount structure, while it's treated as unsigned > everywhere where it is used (saving some places also changed by this > patch). > > Change their type to uint32_t and fix some code using them as int. > > This has been spotted by code inspection. > > Signed-off-by: Carlos Maiolino > --- > fs/xfs/libxfs/xfs_bmap.c | 2 +- > fs/xfs/libxfs/xfs_ialloc.c | 2 +- > fs/xfs/libxfs/xfs_ialloc.h | 2 +- > fs/xfs/xfs_mount.c | 4 ++-- > fs/xfs/xfs_mount.h | 4 ++-- > fs/xfs/xfs_super.c | 10 +++++----- > fs/xfs/xfs_trace.h | 7 ++++--- > 7 files changed, 16 insertions(+), 15 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c > index 667cdd0dfdf4..8b46f15cc414 100644 > --- a/fs/xfs/libxfs/xfs_bmap.c > +++ b/fs/xfs/libxfs/xfs_bmap.c > @@ -3477,7 +3477,7 @@ xfs_bmap_btalloc( > int isaligned; > int tryagain; > int error; > - int stripe_align; > + uint32_t stripe_align; I might've used unsigned int for this, but that's mostly academic. Reviewed-by: Darrick J. Wong --D > > ASSERT(ap->length); > orig_offset = ap->offset; > diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c > index 7fcf62b324b0..75cb2dd78a7a 100644 > --- a/fs/xfs/libxfs/xfs_ialloc.c > +++ b/fs/xfs/libxfs/xfs_ialloc.c > @@ -2913,7 +2913,7 @@ xfs_ialloc_setup_geometry( > xfs_ino_t > xfs_ialloc_calc_rootino( > struct xfs_mount *mp, > - int sunit) > + uint32_t sunit) > { > struct xfs_ino_geometry *igeo = M_IGEO(mp); > xfs_agblock_t first_bno; > diff --git a/fs/xfs/libxfs/xfs_ialloc.h b/fs/xfs/libxfs/xfs_ialloc.h > index 72b3468b97b1..a992bcae5358 100644 > --- a/fs/xfs/libxfs/xfs_ialloc.h > +++ b/fs/xfs/libxfs/xfs_ialloc.h > @@ -152,6 +152,6 @@ int xfs_inobt_insert_rec(struct xfs_btree_cur *cur, uint16_t holemask, > > int xfs_ialloc_cluster_alignment(struct xfs_mount *mp); > void xfs_ialloc_setup_geometry(struct xfs_mount *mp); > -xfs_ino_t xfs_ialloc_calc_rootino(struct xfs_mount *mp, int sunit); > +xfs_ino_t xfs_ialloc_calc_rootino(struct xfs_mount *mp, uint32_t sunit); > > #endif /* __XFS_IALLOC_H__ */ > diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c > index d5dcf9869860..1b1861376854 100644 > --- a/fs/xfs/xfs_mount.c > +++ b/fs/xfs/xfs_mount.c > @@ -368,7 +368,7 @@ xfs_readsb( > static inline int > xfs_check_new_dalign( > struct xfs_mount *mp, > - int new_dalign, > + uint32_t new_dalign, > bool *update_sb) > { > struct xfs_sb *sbp = &mp->m_sb; > @@ -432,7 +432,7 @@ xfs_validate_new_dalign( > mp->m_swidth = XFS_BB_TO_FSBT(mp, mp->m_swidth); > } else { > xfs_warn(mp, > - "alignment check failed: sunit(%d) less than bsize(%d)", > + "alignment check failed: sunit(%u) less than bsize(%d)", > mp->m_dalign, mp->m_sb.sb_blocksize); > return -EINVAL; > } > diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h > index 3725d25ad97e..6552473ab117 100644 > --- a/fs/xfs/xfs_mount.h > +++ b/fs/xfs/xfs_mount.h > @@ -119,8 +119,8 @@ typedef struct xfs_mount { > xfs_extlen_t m_ag_prealloc_blocks; /* reserved ag blocks */ > uint m_alloc_set_aside; /* space we can't use */ > uint m_ag_max_usable; /* max space per AG */ > - int m_dalign; /* stripe unit */ > - int m_swidth; /* stripe width */ > + uint32_t m_dalign; /* stripe unit */ > + uint32_t m_swidth; /* stripe width */ > xfs_agnumber_t m_maxagi; /* highest inode alloc group */ > uint m_allocsize_log;/* min write size log bytes */ > uint m_allocsize_blocks; /* min write size blocks */ > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c > index fa58cb07c8fd..580072b19e8a 100644 > --- a/fs/xfs/xfs_super.c > +++ b/fs/xfs/xfs_super.c > @@ -193,11 +193,11 @@ xfs_fs_show_options( > seq_show_option(m, "rtdev", mp->m_rtname); > > if (mp->m_dalign > 0) > - seq_printf(m, ",sunit=%d", > - (int)XFS_FSB_TO_BB(mp, mp->m_dalign)); > + seq_printf(m, ",sunit=%u", > + XFS_FSB_TO_BB(mp, mp->m_dalign)); > if (mp->m_swidth > 0) > - seq_printf(m, ",swidth=%d", > - (int)XFS_FSB_TO_BB(mp, mp->m_swidth)); > + seq_printf(m, ",swidth=%u", > + XFS_FSB_TO_BB(mp, mp->m_swidth)); > > if (mp->m_qflags & (XFS_UQUOTA_ACCT|XFS_UQUOTA_ENFD)) > seq_puts(m, ",usrquota"); > @@ -1338,7 +1338,7 @@ xfs_fc_validate_params( > > if (mp->m_dalign && (mp->m_swidth % mp->m_dalign != 0)) { > xfs_warn(mp, > - "stripe width (%d) must be a multiple of the stripe unit (%d)", > + "stripe width (%u) must be a multiple of the stripe unit (%u)", > mp->m_swidth, mp->m_dalign); > return -EINVAL; > } > diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h > index 460136628a79..ad0c10e01a73 100644 > --- a/fs/xfs/xfs_trace.h > +++ b/fs/xfs/xfs_trace.h > @@ -3585,11 +3585,12 @@ DEFINE_KMEM_EVENT(kmem_realloc); > DEFINE_KMEM_EVENT(kmem_zone_alloc); > > TRACE_EVENT(xfs_check_new_dalign, > - TP_PROTO(struct xfs_mount *mp, int new_dalign, xfs_ino_t calc_rootino), > + TP_PROTO(struct xfs_mount *mp, uint32_t new_dalign, > + xfs_ino_t calc_rootino), > TP_ARGS(mp, new_dalign, calc_rootino), > TP_STRUCT__entry( > __field(dev_t, dev) > - __field(int, new_dalign) > + __field(uint32_t, new_dalign) > __field(xfs_ino_t, sb_rootino) > __field(xfs_ino_t, calc_rootino) > ), > @@ -3599,7 +3600,7 @@ TRACE_EVENT(xfs_check_new_dalign, > __entry->sb_rootino = mp->m_sb.sb_rootino; > __entry->calc_rootino = calc_rootino; > ), > - TP_printk("dev %d:%d new_dalign %d sb_rootino %llu calc_rootino %llu", > + TP_printk("dev %d:%d new_dalign %u sb_rootino %llu calc_rootino %llu", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->new_dalign, __entry->sb_rootino, > __entry->calc_rootino) > -- > 2.26.2 >