On Tue, Jul 15, 2025 at 02:25:39PM +0200, Christoph Hellwig wrote:
> xchk_trans_alloc_empty can't return errors, so return the allocated
> transaction directly instead of an output double pointer argument.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> fs/xfs/scrub/common.c | 6 +++---
> fs/xfs/scrub/common.h | 2 +-
> fs/xfs/scrub/dir_repair.c | 8 ++------
> fs/xfs/scrub/fscounters.c | 3 ++-
> fs/xfs/scrub/metapath.c | 4 +---
> fs/xfs/scrub/nlinks.c | 8 ++------
> fs/xfs/scrub/nlinks_repair.c | 4 +---
> fs/xfs/scrub/parent_repair.c | 12 +++---------
> fs/xfs/scrub/quotacheck.c | 4 +---
> fs/xfs/scrub/rmap_repair.c | 4 +---
> fs/xfs/scrub/rtrmap_repair.c | 4 +---
> 11 files changed, 18 insertions(+), 41 deletions(-)
Moar yaaaay,
Reviewed-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
--D
>
> diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c
> index d080f4e6e9d8..2ef7742be7d3 100644
> --- a/fs/xfs/scrub/common.c
> +++ b/fs/xfs/scrub/common.c
> @@ -866,12 +866,11 @@ xchk_trans_cancel(
> sc->tp = NULL;
> }
>
> -int
> +void
> xchk_trans_alloc_empty(
> struct xfs_scrub *sc)
> {
> sc->tp = xfs_trans_alloc_empty(sc->mp);
> - return 0;
> }
>
> /*
> @@ -893,7 +892,8 @@ xchk_trans_alloc(
> return xfs_trans_alloc(sc->mp, &M_RES(sc->mp)->tr_itruncate,
> resblks, 0, 0, &sc->tp);
>
> - return xchk_trans_alloc_empty(sc);
> + xchk_trans_alloc_empty(sc);
> + return 0;
> }
>
> /* Set us up with a transaction and an empty context. */
> diff --git a/fs/xfs/scrub/common.h b/fs/xfs/scrub/common.h
> index 19877d99f255..ddbc065c798c 100644
> --- a/fs/xfs/scrub/common.h
> +++ b/fs/xfs/scrub/common.h
> @@ -7,7 +7,7 @@
> #define __XFS_SCRUB_COMMON_H__
>
> int xchk_trans_alloc(struct xfs_scrub *sc, uint resblks);
> -int xchk_trans_alloc_empty(struct xfs_scrub *sc);
> +void xchk_trans_alloc_empty(struct xfs_scrub *sc);
> void xchk_trans_cancel(struct xfs_scrub *sc);
>
> bool xchk_process_error(struct xfs_scrub *sc, xfs_agnumber_t agno,
> diff --git a/fs/xfs/scrub/dir_repair.c b/fs/xfs/scrub/dir_repair.c
> index 249313882108..8d3b550990b5 100644
> --- a/fs/xfs/scrub/dir_repair.c
> +++ b/fs/xfs/scrub/dir_repair.c
> @@ -1289,9 +1289,7 @@ xrep_dir_scan_dirtree(
> if (sc->ilock_flags & (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL))
> xchk_iunlock(sc, sc->ilock_flags & (XFS_ILOCK_SHARED |
> XFS_ILOCK_EXCL));
> - error = xchk_trans_alloc_empty(sc);
> - if (error)
> - return error;
> + xchk_trans_alloc_empty(sc);
>
> while ((error = xchk_iscan_iter(&rd->pscan.iscan, &ip)) == 1) {
> bool flush;
> @@ -1317,9 +1315,7 @@ xrep_dir_scan_dirtree(
> if (error)
> break;
>
> - error = xchk_trans_alloc_empty(sc);
> - if (error)
> - break;
> + xchk_trans_alloc_empty(sc);
> }
>
> if (xchk_should_terminate(sc, &error))
> diff --git a/fs/xfs/scrub/fscounters.c b/fs/xfs/scrub/fscounters.c
> index 9b598c5790ad..cebd0d526926 100644
> --- a/fs/xfs/scrub/fscounters.c
> +++ b/fs/xfs/scrub/fscounters.c
> @@ -237,7 +237,8 @@ xchk_setup_fscounters(
> return error;
> }
>
> - return xchk_trans_alloc_empty(sc);
> + xchk_trans_alloc_empty(sc);
> + return 0;
> }
>
> /*
> diff --git a/fs/xfs/scrub/metapath.c b/fs/xfs/scrub/metapath.c
> index e21c16fbd15d..14939d7de349 100644
> --- a/fs/xfs/scrub/metapath.c
> +++ b/fs/xfs/scrub/metapath.c
> @@ -318,9 +318,7 @@ xchk_metapath(
> return 0;
> }
>
> - error = xchk_trans_alloc_empty(sc);
> - if (error)
> - return error;
> + xchk_trans_alloc_empty(sc);
>
> error = xchk_metapath_ilock_both(mpath);
> if (error)
> diff --git a/fs/xfs/scrub/nlinks.c b/fs/xfs/scrub/nlinks.c
> index 4a47d0aabf73..26721fab5cab 100644
> --- a/fs/xfs/scrub/nlinks.c
> +++ b/fs/xfs/scrub/nlinks.c
> @@ -555,9 +555,7 @@ xchk_nlinks_collect(
> * do not take sb_internal.
> */
> xchk_trans_cancel(sc);
> - error = xchk_trans_alloc_empty(sc);
> - if (error)
> - return error;
> + xchk_trans_alloc_empty(sc);
>
> while ((error = xchk_iscan_iter(&xnc->collect_iscan, &ip)) == 1) {
> if (S_ISDIR(VFS_I(ip)->i_mode))
> @@ -880,9 +878,7 @@ xchk_nlinks_compare(
> * inactivation workqueue.
> */
> xchk_trans_cancel(sc);
> - error = xchk_trans_alloc_empty(sc);
> - if (error)
> - return error;
> + xchk_trans_alloc_empty(sc);
>
> /*
> * Use the inobt to walk all allocated inodes to compare the link
> diff --git a/fs/xfs/scrub/nlinks_repair.c b/fs/xfs/scrub/nlinks_repair.c
> index 4ebdee095428..6ef2ee9c3814 100644
> --- a/fs/xfs/scrub/nlinks_repair.c
> +++ b/fs/xfs/scrub/nlinks_repair.c
> @@ -340,9 +340,7 @@ xrep_nlinks(
> * We can only push the inactivation workqueues with an empty
> * transaction.
> */
> - error = xchk_trans_alloc_empty(sc);
> - if (error)
> - break;
> + xchk_trans_alloc_empty(sc);
> }
> xchk_iscan_iter_finish(&xnc->compare_iscan);
> xchk_iscan_teardown(&xnc->compare_iscan);
> diff --git a/fs/xfs/scrub/parent_repair.c b/fs/xfs/scrub/parent_repair.c
> index 31bfe10be22a..2949feda6271 100644
> --- a/fs/xfs/scrub/parent_repair.c
> +++ b/fs/xfs/scrub/parent_repair.c
> @@ -569,9 +569,7 @@ xrep_parent_scan_dirtree(
> if (sc->ilock_flags & (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL))
> xchk_iunlock(sc, sc->ilock_flags & (XFS_ILOCK_SHARED |
> XFS_ILOCK_EXCL));
> - error = xchk_trans_alloc_empty(sc);
> - if (error)
> - return error;
> + xchk_trans_alloc_empty(sc);
>
> while ((error = xchk_iscan_iter(&rp->pscan.iscan, &ip)) == 1) {
> bool flush;
> @@ -597,9 +595,7 @@ xrep_parent_scan_dirtree(
> if (error)
> break;
>
> - error = xchk_trans_alloc_empty(sc);
> - if (error)
> - break;
> + xchk_trans_alloc_empty(sc);
> }
>
> if (xchk_should_terminate(sc, &error))
> @@ -1099,9 +1095,7 @@ xrep_parent_flush_xattrs(
> xrep_tempfile_iounlock(rp->sc);
>
> /* Recreate the empty transaction and relock the inode. */
> - error = xchk_trans_alloc_empty(rp->sc);
> - if (error)
> - return error;
> + xchk_trans_alloc_empty(rp->sc);
> xchk_ilock(rp->sc, XFS_ILOCK_EXCL);
> return 0;
> }
> diff --git a/fs/xfs/scrub/quotacheck.c b/fs/xfs/scrub/quotacheck.c
> index dc4033b91e44..e4105aaafe84 100644
> --- a/fs/xfs/scrub/quotacheck.c
> +++ b/fs/xfs/scrub/quotacheck.c
> @@ -505,9 +505,7 @@ xqcheck_collect_counts(
> * transactions do not take sb_internal.
> */
> xchk_trans_cancel(sc);
> - error = xchk_trans_alloc_empty(sc);
> - if (error)
> - return error;
> + xchk_trans_alloc_empty(sc);
>
> while ((error = xchk_iscan_iter(&xqc->iscan, &ip)) == 1) {
> error = xqcheck_collect_inode(xqc, ip);
> diff --git a/fs/xfs/scrub/rmap_repair.c b/fs/xfs/scrub/rmap_repair.c
> index f5f73078ffe2..bf1e632b449a 100644
> --- a/fs/xfs/scrub/rmap_repair.c
> +++ b/fs/xfs/scrub/rmap_repair.c
> @@ -951,9 +951,7 @@ xrep_rmap_find_rmaps(
> sa->agf_bp = NULL;
> sa->agi_bp = NULL;
> xchk_trans_cancel(sc);
> - error = xchk_trans_alloc_empty(sc);
> - if (error)
> - return error;
> + xchk_trans_alloc_empty(sc);
>
> /* Iterate all AGs for inodes rmaps. */
> while ((error = xchk_iscan_iter(&rr->iscan, &ip)) == 1) {
> diff --git a/fs/xfs/scrub/rtrmap_repair.c b/fs/xfs/scrub/rtrmap_repair.c
> index fc2592c53af5..4a56726d9952 100644
> --- a/fs/xfs/scrub/rtrmap_repair.c
> +++ b/fs/xfs/scrub/rtrmap_repair.c
> @@ -580,9 +580,7 @@ xrep_rtrmap_find_rmaps(
> */
> xchk_trans_cancel(sc);
> xchk_rtgroup_unlock(&sc->sr);
> - error = xchk_trans_alloc_empty(sc);
> - if (error)
> - return error;
> + xchk_trans_alloc_empty(sc);
>
> while ((error = xchk_iscan_iter(&rr->iscan, &ip)) == 1) {
> error = xrep_rtrmap_scan_inode(rr, ip);
> --
> 2.47.2
>
>
