xfs: mark __xfs_rtgroup_extents static
PATCH 1/2 xfs: mark __xfs_rtgroup_extents static
__xfs_rtgroup_extents is not used outside of xfs_rtgroup.c, so mark it static. Move it and xfs_rtgroup_extents up in the file to avoid forward declarations.
--- fs/xfs/libxfs/xfs_rtgroup.c | 50 ++++++++++++++++++------------------- fs/xfs/libxfs/xfs_rtgroup.h | 2 -- 2 files changed, 25 insertions(+), 27 deletions(-)
fs/xfs/libxfs/xfs_rtgroup.c +25 -25
@@ -48,6 +48,31 @@ xfs_rtgroup_min_block(return 0 ; } +/* Compute the number of rt extents in this realtime group. */ +static xfs_rtxnum_t +__xfs_rtgroup_extents ( +struct xfs_mount *mp, +xfs_rgnumber_t rgno, +xfs_rgnumber_t rgcount, +xfs_rtbxlen_t rextents) +{ +ASSERT (rgno < rgcount); +if (rgno == rgcount -1 ) +return rextents - ((xfs_rtxnum_t )rgno * mp->m_sb.sb_rgextents); + +ASSERT (xfs_has_rtgroups (mp)); +return mp->m_sb.sb_rgextents; +} + +xfs_rtxnum_t +xfs_rtgroup_extents ( +struct xfs_mount *mp, +xfs_rgnumber_t rgno) +{ +return __xfs_rtgroup_extents (mp, rgno, mp->m_sb.sb_rgcount, + mp->m_sb.sb_rextents); +} +/* Precompute this group's geometry */ void xfs_rtgroup_calc_geometry(
@@ -136,31 +161,6 @@ xfs_initialize_rtgroups(return error; } -/* Compute the number of rt extents in this realtime group. */ -xfs_rtxnum_t -__xfs_rtgroup_extents ( -struct xfs_mount *mp, -xfs_rgnumber_t rgno, -xfs_rgnumber_t rgcount, -xfs_rtbxlen_t rextents) -{ -ASSERT (rgno < rgcount); -if (rgno == rgcount -1 ) -return rextents - ((xfs_rtxnum_t )rgno * mp->m_sb.sb_rgextents); - -ASSERT (xfs_has_rtgroups (mp)); -return mp->m_sb.sb_rgextents; -} - -xfs_rtxnum_t -xfs_rtgroup_extents ( -struct xfs_mount *mp, -xfs_rgnumber_t rgno) -{ -return __xfs_rtgroup_extents (mp, rgno, mp->m_sb.sb_rgcount, - mp->m_sb.sb_rextents); -} -/* * Update the rt extent count of the previous tail rtgroup if it changed during * recovery (i.e. recovery of a growfs).
fs/xfs/libxfs/xfs_rtgroup.h +0 -2
@@ -285,8 +285,6 @@ void xfs_free_rtgroups(struct xfs_mount *mp, xfs_rgnumber_t first_rgno,int xfs_initialize_rtgroups (struct xfs_mount *mp,xfs_rgnumber_t first_rgno,xfs_rgnumber_t end_rgno,xfs_rtbxlen_t rextents); -xfs_rtxnum_t __xfs_rtgroup_extents (struct xfs_mount *mp,xfs_rgnumber_t rgno, -xfs_rgnumber_t rgcount,xfs_rtbxlen_t rextents);xfs_rtxnum_t xfs_rtgroup_extents (struct xfs_mount *mp,xfs_rgnumber_t rgno); void xfs_rtgroup_calc_geometry(struct xfs_mount *mp, struct xfs_rtgroup *rtg, xfs_rgnumber_t rgno, xfs_rgnumber_t rgcount,
Signature · 1 line
2.47.3
PATCH 2/2 xfs: fix an overly long line in xfs_rtgroup_calc_geometry
--- fs/xfs/libxfs/xfs_rtgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_rtgroup.c +2 -1
@@ -83,7 +83,8 @@ xfs_rtgroup_calc_geometry( xfs_rtbxlen_t rextents) { rtg->rtg_extents =__xfs_rtgroup_extents (mp, rgno, rgcount, rextents); -rtg_group (rtg)->xg_block_count = rtg->rtg_extents * mp->m_sb.sb_rextsize; +rtg_group (rtg)->xg_block_count = + rtg->rtg_extents * mp->m_sb.sb_rextsize;rtg_group (rtg)->xg_min_gbno =xfs_rtgroup_min_block (mp, rgno); }
Signature · 1 line
2.47.3
Re: [PATCH 2/2] xfs: fix an overly long line in xfs_rtgroup_calc_geometry
Quoted 1 line · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>
--D
Quoted 22 lines
--- fs/xfs/libxfs/xfs_rtgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/xfs/libxfs/xfs_rtgroup.c +2
-1@@ -83,7 +83,8 @@ xfs_rtgroup_calc_geometry( xfs_rtbxlen_t rextents) { rtg->rtg_extents =__xfs_rtgroup_extents (mp, rgno, rgcount, rextents); -rtg_group (rtg)->xg_block_count = rtg->rtg_extents * mp->m_sb.sb_rextsize; +rtg_group (rtg)->xg_block_count = + rtg->rtg_extents * mp->m_sb.sb_rextsize;rtg_group (rtg)->xg_min_gbno =xfs_rtgroup_min_block (mp, rgno); }Signature · 1 line
2.47.3
Quoted 5 lines · Christoph Hellwig
__xfs_rtgroup_extentsis not used outside ofxfs_rtgroup.c, so mark it static. Move it andxfs_rtgroup_extentsup in the file to avoid forward declarations.Signed-off-by Christoph Hellwig <[email protected]>
Looks good to me,
--D
Quoted 90 lines
--- fs/xfs/libxfs/xfs_rtgroup.c | 50 ++++++++++++++++++------------------- fs/xfs/libxfs/xfs_rtgroup.h | 2 -- 2 files changed, 25 insertions(+), 27 deletions(-)fs/xfs/libxfs/xfs_rtgroup.c +25
-25@@ -48,6 +48,31 @@ xfs_rtgroup_min_block(return 0 ; } +/* Compute the number of rt extents in this realtime group. */ +static xfs_rtxnum_t +__xfs_rtgroup_extents ( +struct xfs_mount *mp, +xfs_rgnumber_t rgno, +xfs_rgnumber_t rgcount, +xfs_rtbxlen_t rextents) +{ +ASSERT (rgno < rgcount); +if (rgno == rgcount -1 ) +return rextents - ((xfs_rtxnum_t )rgno * mp->m_sb.sb_rgextents); + +ASSERT (xfs_has_rtgroups (mp)); +return mp->m_sb.sb_rgextents; +} + +xfs_rtxnum_t +xfs_rtgroup_extents ( +struct xfs_mount *mp, +xfs_rgnumber_t rgno) +{ +return __xfs_rtgroup_extents (mp, rgno, mp->m_sb.sb_rgcount, + mp->m_sb.sb_rextents); +} +/* Precompute this group's geometry */ void xfs_rtgroup_calc_geometry(@@ -136,31 +161,6 @@ xfs_initialize_rtgroups(return error; } -/* Compute the number of rt extents in this realtime group. */ -xfs_rtxnum_t -__xfs_rtgroup_extents ( -struct xfs_mount *mp, -xfs_rgnumber_t rgno, -xfs_rgnumber_t rgcount, -xfs_rtbxlen_t rextents) -{ -ASSERT (rgno < rgcount); -if (rgno == rgcount -1 ) -return rextents - ((xfs_rtxnum_t )rgno * mp->m_sb.sb_rgextents); - -ASSERT (xfs_has_rtgroups (mp)); -return mp->m_sb.sb_rgextents; -} - -xfs_rtxnum_t -xfs_rtgroup_extents ( -struct xfs_mount *mp, -xfs_rgnumber_t rgno) -{ -return __xfs_rtgroup_extents (mp, rgno, mp->m_sb.sb_rgcount, - mp->m_sb.sb_rextents); -} -/* * Update the rt extent count of the previous tail rtgroup if it changed during * recovery (i.e. recovery of a growfs). fs/xfs/libxfs/xfs_rtgroup.h +0
-2@@ -285,8 +285,6 @@ void xfs_free_rtgroups(struct xfs_mount *mp, xfs_rgnumber_t first_rgno,int xfs_initialize_rtgroups (struct xfs_mount *mp,xfs_rgnumber_t first_rgno,xfs_rgnumber_t end_rgno,xfs_rtbxlen_t rextents); -xfs_rtxnum_t __xfs_rtgroup_extents (struct xfs_mount *mp,xfs_rgnumber_t rgno, -xfs_rgnumber_t rgcount,xfs_rtbxlen_t rextents);xfs_rtxnum_t xfs_rtgroup_extents (struct xfs_mount *mp,xfs_rgnumber_t rgno); void xfs_rtgroup_calc_geometry(struct xfs_mount *mp, struct xfs_rtgroup *rtg, xfs_rgnumber_t rgno, xfs_rgnumber_t rgcount,Signature · 1 line
2.47.3
Quoted 5 lines · Christoph Hellwig
__xfs_rtgroup_extentsis not used outside ofxfs_rtgroup.c, so mark it static. Move it andxfs_rtgroup_extentsup in the file to avoid forward declarations.
Applied to for-next, thanks!
[1/2] xfs: mark __xfs_rtgroup_extents static
commit: e0aea42a32984a6fd13410aed7afd3bd0caeb1c1
[2/2] xfs: fix an overly long line in xfs_rtgroup_calc_geometry
commit: baed03efe223b1649320e835d7e0c03b3dde0b0cBest regards,
Signature · 1 line
Carlos Maiolino <[email protected]>