| Message ID | 20210726114541.24898-5-chandanrlinux@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xfs: Extend per-inode extent counters | expand |
On Mon, Jul 26, 2021 at 05:15:33PM +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> Not sure why the structure members change places, but otherwise LGTM. Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/xfs/libxfs/xfs_bmap.c | 2 +- > fs/xfs/libxfs/xfs_inode_buf.c | 2 +- > fs/xfs/libxfs/xfs_inode_fork.c | 2 +- > fs/xfs/scrub/inode.c | 2 +- > fs/xfs/scrub/inode_repair.c | 2 +- > fs/xfs/xfs_trace.h | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c > index 282aeb3c0e49..e5d243fd187d 100644 > --- a/fs/xfs/libxfs/xfs_bmap.c > +++ b/fs/xfs/libxfs/xfs_bmap.c > @@ -53,9 +53,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/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c > index 419b92dc6ac8..cba9a38f3270 100644 > --- a/fs/xfs/libxfs/xfs_inode_buf.c > +++ b/fs/xfs/libxfs/xfs_inode_buf.c > @@ -342,7 +342,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/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c > index c6856ec95335..a1e40df585a3 100644 > --- a/fs/xfs/libxfs/xfs_inode_fork.c > +++ b/fs/xfs/libxfs/xfs_inode_fork.c > @@ -107,7 +107,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/fs/xfs/scrub/inode.c b/fs/xfs/scrub/inode.c > index e6068590484b..246d11ca133f 100644 > --- a/fs/xfs/scrub/inode.c > +++ b/fs/xfs/scrub/inode.c > @@ -219,7 +219,7 @@ xchk_dinode( > size_t fork_recs; > unsigned long long isize; > uint64_t flags2; > - uint32_t nextents; > + xfs_extnum_t nextents; > prid_t prid; > uint16_t flags; > uint16_t mode; > diff --git a/fs/xfs/scrub/inode_repair.c b/fs/xfs/scrub/inode_repair.c > index a44d7b48c374..042c7d0bc0f5 100644 > --- a/fs/xfs/scrub/inode_repair.c > +++ b/fs/xfs/scrub/inode_repair.c > @@ -597,9 +597,9 @@ xrep_dinode_bad_extents_fork( > { > struct xfs_bmbt_irec new; > struct xfs_bmbt_rec *dp; > + xfs_extnum_t nex; > bool isrt; > int i; > - int nex; > int fork_size; > > nex = XFS_DFORK_NEXTENTS(dip, whichfork); > diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h > index affc9b5834fb..5ed11f894f79 100644 > --- a/fs/xfs/xfs_trace.h > +++ b/fs/xfs/xfs_trace.h > @@ -2338,7 +2338,7 @@ DECLARE_EVENT_CLASS(xfs_swap_extent_class, > __field(int, which) > __field(xfs_ino_t, ino) > __field(int, format) > - __field(int, nex) > + __field(xfs_extnum_t, nex) > __field(int, broot_size) > __field(int, fork_off) > ), > -- > 2.30.2 >
On 28 Jul 2021 at 03:29, Darrick J. Wong wrote: > On Mon, Jul 26, 2021 at 05:15:33PM +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> > > Not sure why the structure members change places, but otherwise LGTM. The re-arrangement of local variables was supposed to happen in the patch where "xfs_[a]extnum_t" get promoted to larger data types. I will make those movements happen in that patch. > > Reviewed-by: Darrick J. Wong <djwong@kernel.org> Thanks for the review. > > --D > > >> --- >> fs/xfs/libxfs/xfs_bmap.c | 2 +- >> fs/xfs/libxfs/xfs_inode_buf.c | 2 +- >> fs/xfs/libxfs/xfs_inode_fork.c | 2 +- >> fs/xfs/scrub/inode.c | 2 +- >> fs/xfs/scrub/inode_repair.c | 2 +- >> fs/xfs/xfs_trace.h | 2 +- >> 6 files changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c >> index 282aeb3c0e49..e5d243fd187d 100644 >> --- a/fs/xfs/libxfs/xfs_bmap.c >> +++ b/fs/xfs/libxfs/xfs_bmap.c >> @@ -53,9 +53,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/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c >> index 419b92dc6ac8..cba9a38f3270 100644 >> --- a/fs/xfs/libxfs/xfs_inode_buf.c >> +++ b/fs/xfs/libxfs/xfs_inode_buf.c >> @@ -342,7 +342,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/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c >> index c6856ec95335..a1e40df585a3 100644 >> --- a/fs/xfs/libxfs/xfs_inode_fork.c >> +++ b/fs/xfs/libxfs/xfs_inode_fork.c >> @@ -107,7 +107,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/fs/xfs/scrub/inode.c b/fs/xfs/scrub/inode.c >> index e6068590484b..246d11ca133f 100644 >> --- a/fs/xfs/scrub/inode.c >> +++ b/fs/xfs/scrub/inode.c >> @@ -219,7 +219,7 @@ xchk_dinode( >> size_t fork_recs; >> unsigned long long isize; >> uint64_t flags2; >> - uint32_t nextents; >> + xfs_extnum_t nextents; >> prid_t prid; >> uint16_t flags; >> uint16_t mode; >> diff --git a/fs/xfs/scrub/inode_repair.c b/fs/xfs/scrub/inode_repair.c >> index a44d7b48c374..042c7d0bc0f5 100644 >> --- a/fs/xfs/scrub/inode_repair.c >> +++ b/fs/xfs/scrub/inode_repair.c >> @@ -597,9 +597,9 @@ xrep_dinode_bad_extents_fork( >> { >> struct xfs_bmbt_irec new; >> struct xfs_bmbt_rec *dp; >> + xfs_extnum_t nex; >> bool isrt; >> int i; >> - int nex; >> int fork_size; >> >> nex = XFS_DFORK_NEXTENTS(dip, whichfork); >> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h >> index affc9b5834fb..5ed11f894f79 100644 >> --- a/fs/xfs/xfs_trace.h >> +++ b/fs/xfs/xfs_trace.h >> @@ -2338,7 +2338,7 @@ DECLARE_EVENT_CLASS(xfs_swap_extent_class, >> __field(int, which) >> __field(xfs_ino_t, ino) >> __field(int, format) >> - __field(int, nex) >> + __field(xfs_extnum_t, nex) >> __field(int, broot_size) >> __field(int, fork_off) >> ), >> -- >> 2.30.2 >> -- chandan
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 282aeb3c0e49..e5d243fd187d 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -53,9 +53,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/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c index 419b92dc6ac8..cba9a38f3270 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.c +++ b/fs/xfs/libxfs/xfs_inode_buf.c @@ -342,7 +342,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/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c index c6856ec95335..a1e40df585a3 100644 --- a/fs/xfs/libxfs/xfs_inode_fork.c +++ b/fs/xfs/libxfs/xfs_inode_fork.c @@ -107,7 +107,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/fs/xfs/scrub/inode.c b/fs/xfs/scrub/inode.c index e6068590484b..246d11ca133f 100644 --- a/fs/xfs/scrub/inode.c +++ b/fs/xfs/scrub/inode.c @@ -219,7 +219,7 @@ xchk_dinode( size_t fork_recs; unsigned long long isize; uint64_t flags2; - uint32_t nextents; + xfs_extnum_t nextents; prid_t prid; uint16_t flags; uint16_t mode; diff --git a/fs/xfs/scrub/inode_repair.c b/fs/xfs/scrub/inode_repair.c index a44d7b48c374..042c7d0bc0f5 100644 --- a/fs/xfs/scrub/inode_repair.c +++ b/fs/xfs/scrub/inode_repair.c @@ -597,9 +597,9 @@ xrep_dinode_bad_extents_fork( { struct xfs_bmbt_irec new; struct xfs_bmbt_rec *dp; + xfs_extnum_t nex; bool isrt; int i; - int nex; int fork_size; nex = XFS_DFORK_NEXTENTS(dip, whichfork); diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index affc9b5834fb..5ed11f894f79 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h @@ -2338,7 +2338,7 @@ DECLARE_EVENT_CLASS(xfs_swap_extent_class, __field(int, which) __field(xfs_ino_t, ino) __field(int, format) - __field(int, nex) + __field(xfs_extnum_t, nex) __field(int, broot_size) __field(int, fork_off) ),
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> --- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/libxfs/xfs_inode_buf.c | 2 +- fs/xfs/libxfs/xfs_inode_fork.c | 2 +- fs/xfs/scrub/inode.c | 2 +- fs/xfs/scrub/inode_repair.c | 2 +- fs/xfs/xfs_trace.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)