| Message ID | 20211012165203.1354826-3-bfoster@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xfs: fix perag iteration raciness | expand |
On Tue, Oct 12, 2021 at 12:52:01PM -0400, Brian Foster wrote: > Rename the next_agno variable to be consistent across the several > iteration macros and shorten line length. > > Signed-off-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/xfs/libxfs/xfs_ag.h | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_ag.h b/fs/xfs/libxfs/xfs_ag.h > index 48eb22e8d717..cf8baae2ba18 100644 > --- a/fs/xfs/libxfs/xfs_ag.h > +++ b/fs/xfs/libxfs/xfs_ag.h > @@ -127,22 +127,22 @@ void xfs_perag_put(struct xfs_perag *pag); > static inline > struct xfs_perag *xfs_perag_next( > struct xfs_perag *pag, > - xfs_agnumber_t *next_agno) > + xfs_agnumber_t *agno) > { > struct xfs_mount *mp = pag->pag_mount; > > - *next_agno = pag->pag_agno + 1; > + *agno = pag->pag_agno + 1; > xfs_perag_put(pag); > - return xfs_perag_get(mp, *next_agno); > + return xfs_perag_get(mp, *agno); > } > > -#define for_each_perag_range(mp, next_agno, end_agno, pag) \ > - for ((pag) = xfs_perag_get((mp), (next_agno)); \ > - (pag) != NULL && (next_agno) <= (end_agno); \ > - (pag) = xfs_perag_next((pag), &(next_agno))) > +#define for_each_perag_range(mp, agno, end_agno, pag) \ > + for ((pag) = xfs_perag_get((mp), (agno)); \ > + (pag) != NULL && (agno) <= (end_agno); \ > + (pag) = xfs_perag_next((pag), &(agno))) > > -#define for_each_perag_from(mp, next_agno, pag) \ > - for_each_perag_range((mp), (next_agno), (mp)->m_sb.sb_agcount, (pag)) > +#define for_each_perag_from(mp, agno, pag) \ > + for_each_perag_range((mp), (agno), (mp)->m_sb.sb_agcount, (pag)) > > > #define for_each_perag(mp, agno, pag) \ > -- > 2.31.1 >
diff --git a/fs/xfs/libxfs/xfs_ag.h b/fs/xfs/libxfs/xfs_ag.h index 48eb22e8d717..cf8baae2ba18 100644 --- a/fs/xfs/libxfs/xfs_ag.h +++ b/fs/xfs/libxfs/xfs_ag.h @@ -127,22 +127,22 @@ void xfs_perag_put(struct xfs_perag *pag); static inline struct xfs_perag *xfs_perag_next( struct xfs_perag *pag, - xfs_agnumber_t *next_agno) + xfs_agnumber_t *agno) { struct xfs_mount *mp = pag->pag_mount; - *next_agno = pag->pag_agno + 1; + *agno = pag->pag_agno + 1; xfs_perag_put(pag); - return xfs_perag_get(mp, *next_agno); + return xfs_perag_get(mp, *agno); } -#define for_each_perag_range(mp, next_agno, end_agno, pag) \ - for ((pag) = xfs_perag_get((mp), (next_agno)); \ - (pag) != NULL && (next_agno) <= (end_agno); \ - (pag) = xfs_perag_next((pag), &(next_agno))) +#define for_each_perag_range(mp, agno, end_agno, pag) \ + for ((pag) = xfs_perag_get((mp), (agno)); \ + (pag) != NULL && (agno) <= (end_agno); \ + (pag) = xfs_perag_next((pag), &(agno))) -#define for_each_perag_from(mp, next_agno, pag) \ - for_each_perag_range((mp), (next_agno), (mp)->m_sb.sb_agcount, (pag)) +#define for_each_perag_from(mp, agno, pag) \ + for_each_perag_range((mp), (agno), (mp)->m_sb.sb_agcount, (pag)) #define for_each_perag(mp, agno, pag) \
Rename the next_agno variable to be consistent across the several iteration macros and shorten line length. Signed-off-by: Brian Foster <bfoster@redhat.com> --- fs/xfs/libxfs/xfs_ag.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)