Skip to content

Commit e0aea42

Browse files
Christoph Hellwigcmaiolino
authored andcommitted
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. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Carlos Maiolino <cem@kernel.org>
1 parent 6b2d155 commit e0aea42

2 files changed

Lines changed: 25 additions & 27 deletions

File tree

fs/xfs/libxfs/xfs_rtgroup.c

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,31 @@ xfs_rtgroup_min_block(
4848
return 0;
4949
}
5050

51+
/* Compute the number of rt extents in this realtime group. */
52+
static xfs_rtxnum_t
53+
__xfs_rtgroup_extents(
54+
struct xfs_mount *mp,
55+
xfs_rgnumber_t rgno,
56+
xfs_rgnumber_t rgcount,
57+
xfs_rtbxlen_t rextents)
58+
{
59+
ASSERT(rgno < rgcount);
60+
if (rgno == rgcount - 1)
61+
return rextents - ((xfs_rtxnum_t)rgno * mp->m_sb.sb_rgextents);
62+
63+
ASSERT(xfs_has_rtgroups(mp));
64+
return mp->m_sb.sb_rgextents;
65+
}
66+
67+
xfs_rtxnum_t
68+
xfs_rtgroup_extents(
69+
struct xfs_mount *mp,
70+
xfs_rgnumber_t rgno)
71+
{
72+
return __xfs_rtgroup_extents(mp, rgno, mp->m_sb.sb_rgcount,
73+
mp->m_sb.sb_rextents);
74+
}
75+
5176
/* Precompute this group's geometry */
5277
void
5378
xfs_rtgroup_calc_geometry(
@@ -136,31 +161,6 @@ xfs_initialize_rtgroups(
136161
return error;
137162
}
138163

139-
/* Compute the number of rt extents in this realtime group. */
140-
xfs_rtxnum_t
141-
__xfs_rtgroup_extents(
142-
struct xfs_mount *mp,
143-
xfs_rgnumber_t rgno,
144-
xfs_rgnumber_t rgcount,
145-
xfs_rtbxlen_t rextents)
146-
{
147-
ASSERT(rgno < rgcount);
148-
if (rgno == rgcount - 1)
149-
return rextents - ((xfs_rtxnum_t)rgno * mp->m_sb.sb_rgextents);
150-
151-
ASSERT(xfs_has_rtgroups(mp));
152-
return mp->m_sb.sb_rgextents;
153-
}
154-
155-
xfs_rtxnum_t
156-
xfs_rtgroup_extents(
157-
struct xfs_mount *mp,
158-
xfs_rgnumber_t rgno)
159-
{
160-
return __xfs_rtgroup_extents(mp, rgno, mp->m_sb.sb_rgcount,
161-
mp->m_sb.sb_rextents);
162-
}
163-
164164
/*
165165
* Update the rt extent count of the previous tail rtgroup if it changed during
166166
* recovery (i.e. recovery of a growfs).

fs/xfs/libxfs/xfs_rtgroup.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,6 @@ void xfs_free_rtgroups(struct xfs_mount *mp, xfs_rgnumber_t first_rgno,
285285
int xfs_initialize_rtgroups(struct xfs_mount *mp, xfs_rgnumber_t first_rgno,
286286
xfs_rgnumber_t end_rgno, xfs_rtbxlen_t rextents);
287287

288-
xfs_rtxnum_t __xfs_rtgroup_extents(struct xfs_mount *mp, xfs_rgnumber_t rgno,
289-
xfs_rgnumber_t rgcount, xfs_rtbxlen_t rextents);
290288
xfs_rtxnum_t xfs_rtgroup_extents(struct xfs_mount *mp, xfs_rgnumber_t rgno);
291289
void xfs_rtgroup_calc_geometry(struct xfs_mount *mp, struct xfs_rtgroup *rtg,
292290
xfs_rgnumber_t rgno, xfs_rgnumber_t rgcount,

0 commit comments

Comments
 (0)