On Tue, Apr 17, 2018 at 07:40:38PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> Since the transaction allocation helper is about to become more complex,
> move it to common.c and remove the redundant parameters.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/scrub/bmap.c | 3 +--
> fs/xfs/scrub/common.c | 16 +++++++++++++---
> fs/xfs/scrub/common.h | 14 +-------------
> fs/xfs/scrub/inode.c | 5 ++---
> 4 files changed, 17 insertions(+), 21 deletions(-)
>
>
> diff --git a/fs/xfs/scrub/bmap.c b/fs/xfs/scrub/bmap.c
> index 639d14b..3f8fd10 100644
> --- a/fs/xfs/scrub/bmap.c
> +++ b/fs/xfs/scrub/bmap.c
> @@ -51,7 +51,6 @@ xfs_scrub_setup_inode_bmap(
> struct xfs_scrub_context *sc,
> struct xfs_inode *ip)
> {
> - struct xfs_mount *mp = sc->mp;
> int error;
>
> error = xfs_scrub_get_inode(sc, ip);
> @@ -75,7 +74,7 @@ xfs_scrub_setup_inode_bmap(
> }
>
> /* Got the inode, lock it and we're ready to go. */
> - error = xfs_scrub_trans_alloc(sc->sm, mp, &sc->tp);
> + error = xfs_scrub_trans_alloc(sc);
> if (error)
> goto out;
> sc->ilock_flags |= XFS_ILOCK_EXCL;
> diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c
> index 3f72176..f5e281a 100644
> --- a/fs/xfs/scrub/common.c
> +++ b/fs/xfs/scrub/common.c
> @@ -568,13 +568,24 @@ xfs_scrub_ag_init(
>
> /* Per-scrubber setup functions */
>
> +/*
> + * Grab an empty transaction so that we can re-grab locked buffers if
> + * one of our btrees turns out to be cyclic.
> + */
> +int
> +xfs_scrub_trans_alloc(
> + struct xfs_scrub_context *sc)
> +{
> + return xfs_trans_alloc_empty(sc->mp, &sc->tp);
> +}
> +
> /* Set us up with a transaction and an empty context. */
> int
> xfs_scrub_setup_fs(
> struct xfs_scrub_context *sc,
> struct xfs_inode *ip)
> {
> - return xfs_scrub_trans_alloc(sc->sm, sc->mp, &sc->tp);
> + return xfs_scrub_trans_alloc(sc);
> }
>
> /* Set us up with AG headers and btree cursors. */
> @@ -695,7 +706,6 @@ xfs_scrub_setup_inode_contents(
> struct xfs_inode *ip,
> unsigned int resblks)
> {
> - struct xfs_mount *mp = sc->mp;
> int error;
>
> error = xfs_scrub_get_inode(sc, ip);
> @@ -705,7 +715,7 @@ xfs_scrub_setup_inode_contents(
> /* Got the inode, lock it and we're ready to go. */
> sc->ilock_flags = XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL;
> xfs_ilock(sc->ip, sc->ilock_flags);
> - error = xfs_scrub_trans_alloc(sc->sm, mp, &sc->tp);
> + error = xfs_scrub_trans_alloc(sc);
> if (error)
> goto out;
> sc->ilock_flags |= XFS_ILOCK_EXCL;
> diff --git a/fs/xfs/scrub/common.h b/fs/xfs/scrub/common.h
> index 30e9039..8296873 100644
> --- a/fs/xfs/scrub/common.h
> +++ b/fs/xfs/scrub/common.h
> @@ -38,19 +38,7 @@ xfs_scrub_should_terminate(
> return false;
> }
>
> -/*
> - * Grab an empty transaction so that we can re-grab locked buffers if
> - * one of our btrees turns out to be cyclic.
> - */
> -static inline int
> -xfs_scrub_trans_alloc(
> - struct xfs_scrub_metadata *sm,
> - struct xfs_mount *mp,
> - struct xfs_trans **tpp)
> -{
> - return xfs_trans_alloc_empty(mp, tpp);
> -}
> -
> +int xfs_scrub_trans_alloc(struct xfs_scrub_context *sc);
> bool xfs_scrub_process_error(struct xfs_scrub_context *sc, xfs_agnumber_t agno,
> xfs_agblock_t bno, int *error);
> bool xfs_scrub_fblock_process_error(struct xfs_scrub_context *sc, int whichfork,
> diff --git a/fs/xfs/scrub/inode.c b/fs/xfs/scrub/inode.c
> index df14930..e15b1bc 100644
> --- a/fs/xfs/scrub/inode.c
> +++ b/fs/xfs/scrub/inode.c
> @@ -55,7 +55,6 @@ xfs_scrub_setup_inode(
> struct xfs_scrub_context *sc,
> struct xfs_inode *ip)
> {
> - struct xfs_mount *mp = sc->mp;
> int error;
>
> /*
> @@ -68,7 +67,7 @@ xfs_scrub_setup_inode(
> break;
> case -EFSCORRUPTED:
> case -EFSBADCRC:
> - return xfs_scrub_trans_alloc(sc->sm, mp, &sc->tp);
> + return xfs_scrub_trans_alloc(sc);
> default:
> return error;
> }
> @@ -76,7 +75,7 @@ xfs_scrub_setup_inode(
> /* Got the inode, lock it and we're ready to go. */
> sc->ilock_flags = XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL;
> xfs_ilock(sc->ip, sc->ilock_flags);
> - error = xfs_scrub_trans_alloc(sc->sm, mp, &sc->tp);
> + error = xfs_scrub_trans_alloc(sc);
> if (error)
> goto out;
> sc->ilock_flags |= XFS_ILOCK_EXCL;
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
