From: Brian Foster Date: Thu, 28 Apr 2022 19:39:02 +0000 (-0400) Subject: xfs: fold perag loop iteration logic into helper function X-Git-Tag: v5.16.0-rc0~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b79218242b786a2c02bcac9f53fdae45e2e61e90;p=thirdparty%2Fxfsprogs-dev.git xfs: fold perag loop iteration logic into helper function Source kernel commit: bf2307b195135ed9c95eebb38920d8bd41843092 Fold the loop iteration logic into a helper in preparation for further fixups. No functional change in this patch. Signed-off-by: Brian Foster Reviewed-by: Dave Chinner Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Eric Sandeen --- diff --git a/libxfs/xfs_ag.h b/libxfs/xfs_ag.h index 2522f7661..95570df0b 100644 --- a/libxfs/xfs_ag.h +++ b/libxfs/xfs_ag.h @@ -126,12 +126,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))