On Tue, Apr 17, 2018 at 07:40:26PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> All scrub code runs in transaction context, which means that memory
> allocations are automatically run in PF_MEMALLOC_NOFS context. It's
> therefore unnecessary to pass in KM_NOFS to allocation routines, so
> clean them all out.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/scrub/agheader.c | 3 ++-
> fs/xfs/scrub/btree.c | 2 +-
> fs/xfs/scrub/refcount.c | 2 +-
> 3 files changed, 4 insertions(+), 3 deletions(-)
>
>
> diff --git a/fs/xfs/scrub/agheader.c b/fs/xfs/scrub/agheader.c
> index aacbc3f..6c6e4d8 100644
> --- a/fs/xfs/scrub/agheader.c
> +++ b/fs/xfs/scrub/agheader.c
> @@ -798,7 +798,8 @@ xfs_scrub_agfl(
> }
> memset(&sai, 0, sizeof(sai));
> sai.sz_entries = agflcount;
> - sai.entries = kmem_zalloc(sizeof(xfs_agblock_t) * agflcount, KM_NOFS);
> + sai.entries = kmem_zalloc(sizeof(xfs_agblock_t) * agflcount,
> + KM_MAYFAIL);
> if (!sai.entries) {
> error = -ENOMEM;
> goto out;
> diff --git a/fs/xfs/scrub/btree.c b/fs/xfs/scrub/btree.c
> index 5421816..ea972da 100644
> --- a/fs/xfs/scrub/btree.c
> +++ b/fs/xfs/scrub/btree.c
> @@ -442,7 +442,7 @@ xfs_scrub_btree_check_owner(
> */
> if (cur->bc_btnum == XFS_BTNUM_BNO || cur->bc_btnum == XFS_BTNUM_RMAP) {
> co = kmem_alloc(sizeof(struct check_owner),
> - KM_MAYFAIL | KM_NOFS);
> + KM_MAYFAIL);
> if (!co)
> return -ENOMEM;
> co->level = level;
> diff --git a/fs/xfs/scrub/refcount.c b/fs/xfs/scrub/refcount.c
> index 823bda3..5fff94d 100644
> --- a/fs/xfs/scrub/refcount.c
> +++ b/fs/xfs/scrub/refcount.c
> @@ -150,7 +150,7 @@ xfs_scrub_refcountbt_rmap_check(
> * so we don't need insertion sort here.
> */
> frag = kmem_alloc(sizeof(struct xfs_scrub_refcnt_frag),
> - KM_MAYFAIL | KM_NOFS);
> + KM_MAYFAIL);
> if (!frag)
> return -ENOMEM;
> memcpy(&frag->rm, rec, sizeof(frag->rm));
>
> --
> 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
