diff options
author | Brian Behlendorf <[email protected]> | 2016-11-30 16:18:20 -0700 |
---|---|---|
committer | GitHub <[email protected]> | 2016-11-30 16:18:20 -0700 |
commit | a3fd9d9e1525d5df18b7f8c2895270689d292ec2 (patch) | |
tree | fb38211398d59ccbd9376b2e3aa52924af133255 /module/zfs/zap_micro.c | |
parent | 7657defc48b7c47a8bf0c8f21c78783d293dc5ed (diff) |
Convert zio_buf_alloc() consumers
In multiple cases zio_buf_alloc() was used instead of kmem_alloc()
or vmem_alloc(). This was often done because the allocations
could be large and it was easy to use zfs_buf_alloc() for them.
But this isn't ideal for allocations which are small or short
lived. In these cases it is better to use kmem_alloc() or
vmem_alloc(). If possible we want to avoid the case where
we have slabs allocated for kmem caches which are rarely used.
Note for small allocations vmem_alloc() will be internally
converted to kmem_alloc(). Therefore as long as large
allocations are infrequent and short lived the penalty for
using vmem_alloc() is small.
Reviewed-by: Chunwei Chen <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #5409
Diffstat (limited to 'module/zfs/zap_micro.c')
-rw-r--r-- | module/zfs/zap_micro.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/zfs/zap_micro.c b/module/zfs/zap_micro.c index a15e22c5b..131c33e29 100644 --- a/module/zfs/zap_micro.c +++ b/module/zfs/zap_micro.c @@ -584,7 +584,7 @@ mzap_upgrade(zap_t **zapp, void *tag, dmu_tx_t *tx, zap_flags_t flags) ASSERT(RW_WRITE_HELD(&zap->zap_rwlock)); sz = zap->zap_dbuf->db_size; - mzp = zio_buf_alloc(sz); + mzp = vmem_alloc(sz, KM_SLEEP); bcopy(zap->zap_dbuf->db_data, mzp, sz); nchunks = zap->zap_m.zap_num_chunks; @@ -592,7 +592,7 @@ mzap_upgrade(zap_t **zapp, void *tag, dmu_tx_t *tx, zap_flags_t flags) err = dmu_object_set_blocksize(zap->zap_objset, zap->zap_object, 1ULL << fzap_default_block_shift, 0, tx); if (err) { - zio_buf_free(mzp, sz); + vmem_free(mzp, sz); return (err); } } @@ -619,7 +619,7 @@ mzap_upgrade(zap_t **zapp, void *tag, dmu_tx_t *tx, zap_flags_t flags) if (err) break; } - zio_buf_free(mzp, sz); + vmem_free(mzp, sz); *zapp = zap; return (err); } |