@@ -1685,7 +1685,7 @@ zio_vdev_child_io(zio_t *pio, blkptr_t *bp, vdev_t *vd, uint64_t offset,
1685
1685
* If this is a retried I/O then we ignore it since we will
1686
1686
* have already processed the original allocating I/O.
1687
1687
*/
1688
- if (flags & ZIO_FLAG_IO_ALLOCATING &&
1688
+ if (flags & ZIO_FLAG_ALLOC_THROTTLED &&
1689
1689
(vd != vd -> vdev_top || (flags & ZIO_FLAG_IO_RETRY ))) {
1690
1690
ASSERT (pio -> io_metaslab_class != NULL );
1691
1691
ASSERT (pio -> io_metaslab_class -> mc_alloc_throttle_enabled );
@@ -1695,7 +1695,7 @@ zio_vdev_child_io(zio_t *pio, blkptr_t *bp, vdev_t *vd, uint64_t offset,
1695
1695
ASSERT (!(pio -> io_flags & ZIO_FLAG_IO_REWRITE ) ||
1696
1696
pio -> io_child_type == ZIO_CHILD_GANG );
1697
1697
1698
- flags &= ~ZIO_FLAG_IO_ALLOCATING ;
1698
+ flags &= ~ZIO_FLAG_ALLOC_THROTTLED ;
1699
1699
}
1700
1700
1701
1701
zio = zio_create (pio , pio -> io_spa , pio -> io_txg , bp , data , size , size ,
@@ -3157,7 +3157,7 @@ zio_write_gang_block(zio_t *pio, metaslab_class_t *mc)
3157
3157
3158
3158
ASSERT (ZIO_HAS_ALLOCATOR (pio ));
3159
3159
int flags = METASLAB_GANG_HEADER ;
3160
- if (pio -> io_flags & ZIO_FLAG_IO_ALLOCATING ) {
3160
+ if (pio -> io_flags & ZIO_FLAG_ALLOC_THROTTLED ) {
3161
3161
ASSERT (pio -> io_priority == ZIO_PRIORITY_ASYNC_WRITE );
3162
3162
ASSERT (has_data );
3163
3163
@@ -3192,11 +3192,11 @@ zio_write_gang_block(zio_t *pio, metaslab_class_t *mc)
3192
3192
ZIO_GANG_CHILD_FLAGS (pio ), & pio -> io_bookmark );
3193
3193
3194
3194
zio_gang_inherit_allocator (pio , zio );
3195
- if (pio -> io_flags & ZIO_FLAG_IO_ALLOCATING ) {
3195
+ if (pio -> io_flags & ZIO_FLAG_ALLOC_THROTTLED ) {
3196
3196
boolean_t more ;
3197
3197
VERIFY (metaslab_class_throttle_reserve (mc , zio -> io_allocator ,
3198
3198
gbh_copies , zio -> io_size , B_TRUE , & more ));
3199
- zio -> io_flags |= ZIO_FLAG_IO_ALLOCATING ;
3199
+ zio -> io_flags |= ZIO_FLAG_ALLOC_THROTTLED ;
3200
3200
}
3201
3201
3202
3202
/*
@@ -4083,7 +4083,7 @@ zio_io_to_allocate(metaslab_class_allocator_t *mca, boolean_t *more)
4083
4083
B_FALSE , more )) {
4084
4084
return (NULL );
4085
4085
}
4086
- zio -> io_flags |= ZIO_FLAG_IO_ALLOCATING ;
4086
+ zio -> io_flags |= ZIO_FLAG_ALLOC_THROTTLED ;
4087
4087
4088
4088
avl_remove (& mca -> mca_tree , zio );
4089
4089
ASSERT3U (zio -> io_stage , < , ZIO_STAGE_DVA_ALLOCATE );
@@ -4239,14 +4239,14 @@ zio_dva_allocate(zio_t *zio)
4239
4239
* If we are holding old class reservation, drop it.
4240
4240
* Dispatch the next ZIO(s) there if some are waiting.
4241
4241
*/
4242
- if (zio -> io_flags & ZIO_FLAG_IO_ALLOCATING ) {
4242
+ if (zio -> io_flags & ZIO_FLAG_ALLOC_THROTTLED ) {
4243
4243
if (metaslab_class_throttle_unreserve (mc ,
4244
4244
zio -> io_allocator , zio -> io_prop .zp_copies ,
4245
4245
zio -> io_size )) {
4246
4246
zio_allocate_dispatch (zio -> io_metaslab_class ,
4247
4247
zio -> io_allocator );
4248
4248
}
4249
- zio -> io_flags &= ~ZIO_FLAG_IO_ALLOCATING ;
4249
+ zio -> io_flags &= ~ZIO_FLAG_ALLOC_THROTTLED ;
4250
4250
}
4251
4251
4252
4252
if (zfs_flags & ZFS_DEBUG_METASLAB_ALLOC ) {
@@ -5206,7 +5206,7 @@ zio_ready(zio_t *zio)
5206
5206
if (zio -> io_error != 0 ) {
5207
5207
zio -> io_pipeline = ZIO_INTERLOCK_PIPELINE ;
5208
5208
5209
- if (zio -> io_flags & ZIO_FLAG_IO_ALLOCATING ) {
5209
+ if (zio -> io_flags & ZIO_FLAG_ALLOC_THROTTLED ) {
5210
5210
ASSERT (IO_IS_ALLOCATING (zio ));
5211
5211
ASSERT (zio -> io_priority == ZIO_PRIORITY_ASYNC_WRITE );
5212
5212
ASSERT (zio -> io_metaslab_class != NULL );
@@ -5277,7 +5277,7 @@ zio_dva_throttle_done(zio_t *zio)
5277
5277
ASSERT3P (vd , = = , vd -> vdev_top );
5278
5278
ASSERT (zio_injection_enabled || !(zio -> io_flags & ZIO_FLAG_IO_RETRY ));
5279
5279
ASSERT (!(zio -> io_flags & ZIO_FLAG_IO_REPAIR ));
5280
- ASSERT (zio -> io_flags & ZIO_FLAG_IO_ALLOCATING );
5280
+ ASSERT (zio -> io_flags & ZIO_FLAG_ALLOC_THROTTLED );
5281
5281
5282
5282
/*
5283
5283
* Parents of gang children can have two flavors -- ones that allocated
@@ -5333,7 +5333,7 @@ zio_done(zio_t *zio)
5333
5333
* write. We must do this since the allocation is performed
5334
5334
* by the logical I/O but the actual write is done by child I/Os.
5335
5335
*/
5336
- if (zio -> io_flags & ZIO_FLAG_IO_ALLOCATING &&
5336
+ if (zio -> io_flags & ZIO_FLAG_ALLOC_THROTTLED &&
5337
5337
zio -> io_child_type == ZIO_CHILD_VDEV )
5338
5338
zio_dva_throttle_done (zio );
5339
5339
0 commit comments