diff options
| author | Matthew Ahrens <[email protected]> | 2020-09-04 10:29:39 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-09-04 10:29:39 -0700 |
| commit | 3808032489f28c1f36b39c9a3274d5f4b6f9638a (patch) | |
| tree | 34b2a72f5452c097da400b3571443bf3e671ee93 /module/zfs/vdev_initialize.c | |
| parent | cd80273909184426d5f38050c3163de43031098f (diff) | |
nowait synctask must succeed
If a `zfs_space_check_t` other than `ZFS_SPACE_CHECK_NONE` is used with
`dsl_sync_task_nowait()`, the sync task may fail due to ENOSPC.
However, there is no way to notice or communicate this failure, so it's
extremely difficult to use this functionality correctly, and in fact
almost all callers use `ZFS_SPACE_CHECK_NONE`.
This commit removes the `zfs_space_check_t` argument from
`dsl_sync_task_nowait()`, and always uses `ZFS_SPACE_CHECK_NONE`.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matthew Ahrens <[email protected]>
Closes #10855
Diffstat (limited to 'module/zfs/vdev_initialize.c')
| -rw-r--r-- | module/zfs/vdev_initialize.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/module/zfs/vdev_initialize.c b/module/zfs/vdev_initialize.c index ab711441d..7ff7fffcc 100644 --- a/module/zfs/vdev_initialize.c +++ b/module/zfs/vdev_initialize.c @@ -126,7 +126,7 @@ vdev_initialize_change_state(vdev_t *vd, vdev_initializing_state_t new_state) dmu_tx_t *tx = dmu_tx_create_dd(spa_get_dsl(spa)->dp_mos_dir); VERIFY0(dmu_tx_assign(tx, TXG_WAIT)); dsl_sync_task_nowait(spa_get_dsl(spa), vdev_initialize_zap_update_sync, - guid, 2, ZFS_SPACE_CHECK_NONE, tx); + guid, tx); switch (new_state) { case VDEV_INITIALIZE_ACTIVE: @@ -216,8 +216,7 @@ vdev_initialize_write(vdev_t *vd, uint64_t start, uint64_t size, abd_t *data) /* This is the first write of this txg. */ dsl_sync_task_nowait(spa_get_dsl(spa), - vdev_initialize_zap_update_sync, guid, 2, - ZFS_SPACE_CHECK_RESERVED, tx); + vdev_initialize_zap_update_sync, guid, tx); } /* |