| Message ID | 20210726114724.24956-5-chandanrlinux@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xfsprogs: Extend per-inode extent counters | expand |
On Mon, Jul 26, 2021 at 05:17:16PM +0530, Chandan Babu R wrote: > xfs_extnum_t is the type to use to declare variables which have values > obtained from xfs_dinode->di_[a]nextents. This commit replaces basic > types (e.g. uint32_t) with xfs_extnum_t for such variables. > > Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com> > --- > db/bmap.c | 2 +- > db/frag.c | 2 +- For the db and repair parts, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > libxfs/xfs_bmap.c | 2 +- > libxfs/xfs_inode_buf.c | 2 +- > libxfs/xfs_inode_fork.c | 2 +- > repair/dinode.c | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/db/bmap.c b/db/bmap.c > index 5f81d2b52..50f0474bc 100644 > --- a/db/bmap.c > +++ b/db/bmap.c > @@ -47,7 +47,7 @@ bmap( > int n; > int nex; > xfs_fsblock_t nextbno; > - int nextents; > + xfs_extnum_t nextents; > xfs_bmbt_ptr_t *pp; > xfs_bmdr_block_t *rblock; > typnm_t typ; > diff --git a/db/frag.c b/db/frag.c > index 570ad3b74..90fa2131c 100644 > --- a/db/frag.c > +++ b/db/frag.c > @@ -273,7 +273,7 @@ process_fork( > int whichfork) > { > extmap_t *extmap; > - int nex; > + xfs_extnum_t nex; > > nex = XFS_DFORK_NEXTENTS(dip, whichfork); > if (!nex) > diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c > index 608ae5b83..dd60d8105 100644 > --- a/libxfs/xfs_bmap.c > +++ b/libxfs/xfs_bmap.c > @@ -46,9 +46,9 @@ xfs_bmap_compute_maxlevels( > xfs_mount_t *mp, /* file system mount structure */ > int whichfork) /* data or attr fork */ > { > + xfs_extnum_t maxleafents; /* max leaf entries possible */ > int level; /* btree level */ > uint maxblocks; /* max blocks at this level */ > - uint maxleafents; /* max leaf entries possible */ > int maxrootrecs; /* max records in root block */ > int minleafrecs; /* min records in leaf block */ > int minnoderecs; /* min records in node block */ > diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c > index 056fe252b..b2e8e431a 100644 > --- a/libxfs/xfs_inode_buf.c > +++ b/libxfs/xfs_inode_buf.c > @@ -339,7 +339,7 @@ xfs_dinode_verify_fork( > struct xfs_mount *mp, > int whichfork) > { > - uint32_t di_nextents = XFS_DFORK_NEXTENTS(dip, whichfork); > + xfs_extnum_t di_nextents = XFS_DFORK_NEXTENTS(dip, whichfork); > xfs_extnum_t max_extents; > > switch (XFS_DFORK_FORMAT(dip, whichfork)) { > diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c > index 4cd117382..48afaaeec 100644 > --- a/libxfs/xfs_inode_fork.c > +++ b/libxfs/xfs_inode_fork.c > @@ -105,7 +105,7 @@ xfs_iformat_extents( > struct xfs_mount *mp = ip->i_mount; > struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, whichfork); > int state = xfs_bmap_fork_to_state(whichfork); > - int nex = XFS_DFORK_NEXTENTS(dip, whichfork); > + xfs_extnum_t nex = XFS_DFORK_NEXTENTS(dip, whichfork); > int size = nex * sizeof(xfs_bmbt_rec_t); > struct xfs_iext_cursor icur; > struct xfs_bmbt_rec *dp; > diff --git a/repair/dinode.c b/repair/dinode.c > index a0c5be7c3..a034b5e86 100644 > --- a/repair/dinode.c > +++ b/repair/dinode.c > @@ -967,7 +967,7 @@ process_exinode( > xfs_bmbt_rec_t *rp; > xfs_fileoff_t first_key; > xfs_fileoff_t last_key; > - int32_t numrecs; > + xfs_extnum_t numrecs; > int ret; > > lino = XFS_AGINO_TO_INO(mp, agno, ino); > -- > 2.30.2 >
diff --git a/db/bmap.c b/db/bmap.c index 5f81d2b52..50f0474bc 100644 --- a/db/bmap.c +++ b/db/bmap.c @@ -47,7 +47,7 @@ bmap( int n; int nex; xfs_fsblock_t nextbno; - int nextents; + xfs_extnum_t nextents; xfs_bmbt_ptr_t *pp; xfs_bmdr_block_t *rblock; typnm_t typ; diff --git a/db/frag.c b/db/frag.c index 570ad3b74..90fa2131c 100644 --- a/db/frag.c +++ b/db/frag.c @@ -273,7 +273,7 @@ process_fork( int whichfork) { extmap_t *extmap; - int nex; + xfs_extnum_t nex; nex = XFS_DFORK_NEXTENTS(dip, whichfork); if (!nex) diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 608ae5b83..dd60d8105 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -46,9 +46,9 @@ xfs_bmap_compute_maxlevels( xfs_mount_t *mp, /* file system mount structure */ int whichfork) /* data or attr fork */ { + xfs_extnum_t maxleafents; /* max leaf entries possible */ int level; /* btree level */ uint maxblocks; /* max blocks at this level */ - uint maxleafents; /* max leaf entries possible */ int maxrootrecs; /* max records in root block */ int minleafrecs; /* min records in leaf block */ int minnoderecs; /* min records in node block */ diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c index 056fe252b..b2e8e431a 100644 --- a/libxfs/xfs_inode_buf.c +++ b/libxfs/xfs_inode_buf.c @@ -339,7 +339,7 @@ xfs_dinode_verify_fork( struct xfs_mount *mp, int whichfork) { - uint32_t di_nextents = XFS_DFORK_NEXTENTS(dip, whichfork); + xfs_extnum_t di_nextents = XFS_DFORK_NEXTENTS(dip, whichfork); xfs_extnum_t max_extents; switch (XFS_DFORK_FORMAT(dip, whichfork)) { diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c index 4cd117382..48afaaeec 100644 --- a/libxfs/xfs_inode_fork.c +++ b/libxfs/xfs_inode_fork.c @@ -105,7 +105,7 @@ xfs_iformat_extents( struct xfs_mount *mp = ip->i_mount; struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, whichfork); int state = xfs_bmap_fork_to_state(whichfork); - int nex = XFS_DFORK_NEXTENTS(dip, whichfork); + xfs_extnum_t nex = XFS_DFORK_NEXTENTS(dip, whichfork); int size = nex * sizeof(xfs_bmbt_rec_t); struct xfs_iext_cursor icur; struct xfs_bmbt_rec *dp; diff --git a/repair/dinode.c b/repair/dinode.c index a0c5be7c3..a034b5e86 100644 --- a/repair/dinode.c +++ b/repair/dinode.c @@ -967,7 +967,7 @@ process_exinode( xfs_bmbt_rec_t *rp; xfs_fileoff_t first_key; xfs_fileoff_t last_key; - int32_t numrecs; + xfs_extnum_t numrecs; int ret; lino = XFS_AGINO_TO_INO(mp, agno, ino);
xfs_extnum_t is the type to use to declare variables which have values obtained from xfs_dinode->di_[a]nextents. This commit replaces basic types (e.g. uint32_t) with xfs_extnum_t for such variables. Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com> --- db/bmap.c | 2 +- db/frag.c | 2 +- libxfs/xfs_bmap.c | 2 +- libxfs/xfs_inode_buf.c | 2 +- libxfs/xfs_inode_fork.c | 2 +- repair/dinode.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)