| Message ID | 20211012165203.1354826-2-bfoster@redhat.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | xfs: fix perag iteration raciness | expand |
On Tue, Oct 12, 2021 at 12:52:00PM -0400, Brian Foster wrote: > Fold the loop iteration logic into a helper in preparation for > further fixups. No functional change in this patch. > > Signed-off-by: Brian Foster <bfoster@redhat.com> > --- > fs/xfs/libxfs/xfs_ag.h | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_ag.h b/fs/xfs/libxfs/xfs_ag.h > index 4c6f9045baca..48eb22e8d717 100644 > --- a/fs/xfs/libxfs/xfs_ag.h > +++ b/fs/xfs/libxfs/xfs_ag.h > @@ -124,12 +124,22 @@ void xfs_perag_put(struct xfs_perag *pag); > * for_each_perag_from() because they terminate at sb_agcount where there are > * no perag structures in tree beyond end_agno. > */ > +static inline > +struct xfs_perag *xfs_perag_next( Dorky style nit: function name goes at the start of the line. static inline struct xfs_perag * xfs_perag_next( With that fixed, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > + struct xfs_perag *pag, > + xfs_agnumber_t *next_agno) > +{ > + struct xfs_mount *mp = pag->pag_mount; > + > + *next_agno = pag->pag_agno + 1; > + xfs_perag_put(pag); > + return xfs_perag_get(mp, *next_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); \ > - (next_agno) = (pag)->pag_agno + 1, \ > - xfs_perag_put(pag), \ > - (pag) = xfs_perag_get((mp), (next_agno))) > + (pag) = xfs_perag_next((pag), &(next_agno))) > > #define for_each_perag_from(mp, next_agno, pag) \ > for_each_perag_range((mp), (next_agno), (mp)->m_sb.sb_agcount, (pag)) > -- > 2.31.1 >
diff --git a/fs/xfs/libxfs/xfs_ag.h b/fs/xfs/libxfs/xfs_ag.h index 4c6f9045baca..48eb22e8d717 100644 --- a/fs/xfs/libxfs/xfs_ag.h +++ b/fs/xfs/libxfs/xfs_ag.h @@ -124,12 +124,22 @@ void xfs_perag_put(struct xfs_perag *pag); * for_each_perag_from() because they terminate at sb_agcount where there are * no perag structures in tree beyond end_agno. */ +static inline +struct xfs_perag *xfs_perag_next( + struct xfs_perag *pag, + xfs_agnumber_t *next_agno) +{ + struct xfs_mount *mp = pag->pag_mount; + + *next_agno = pag->pag_agno + 1; + xfs_perag_put(pag); + return xfs_perag_get(mp, *next_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); \ - (next_agno) = (pag)->pag_agno + 1, \ - xfs_perag_put(pag), \ - (pag) = xfs_perag_get((mp), (next_agno))) + (pag) = xfs_perag_next((pag), &(next_agno))) #define for_each_perag_from(mp, next_agno, pag) \ for_each_perag_range((mp), (next_agno), (mp)->m_sb.sb_agcount, (pag))
Fold the loop iteration logic into a helper in preparation for further fixups. No functional change in this patch. Signed-off-by: Brian Foster <bfoster@redhat.com> --- fs/xfs/libxfs/xfs_ag.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)