diff options
| author | Darrick J. Wong | 2018-05-09 19:02:00 +0200 |
|---|---|---|
| committer | Darrick J. Wong | 2018-05-16 02:57:05 +0200 |
| commit | 631fc955bdc86c3fed5880cba80c663d1b32e0c2 (patch) | |
| tree | 75d8ae72609e593fdeb7f6c9421460da41bd5439 /fs/xfs/scrub | |
| parent | xfs: avoid ilock games in the quota scrubber (diff) | |
| download | kernel-qcow2-linux-631fc955bdc86c3fed5880cba80c663d1b32e0c2.tar.gz kernel-qcow2-linux-631fc955bdc86c3fed5880cba80c663d1b32e0c2.tar.xz kernel-qcow2-linux-631fc955bdc86c3fed5880cba80c663d1b32e0c2.zip | |
xfs: clean up scrub usage of KM_NOFS
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@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Diffstat (limited to 'fs/xfs/scrub')
| -rw-r--r-- | fs/xfs/scrub/agheader.c | 3 | ||||
| -rw-r--r-- | fs/xfs/scrub/btree.c | 2 | ||||
| -rw-r--r-- | 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 018aabbd9394..08a1f013d92c 100644 --- a/fs/xfs/scrub/agheader.c +++ b/fs/xfs/scrub/agheader.c @@ -797,7 +797,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 54218168c8f9..ea972dab1485 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 400f1561cd3d..d86526d2932c 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)); |