diff options
| author | Paul Zuchowski <31706010+PaulZ-98@users.noreply.github.com> | 2021-05-14 00:46:14 -0400 |
|---|---|---|
| committer | Tony Hutter <hutter2@llnl.gov> | 2021-06-01 17:31:14 -0700 |
| commit | ee2a9d2c771657168652e058477b81389c662b5e (patch) | |
| tree | 2c691802fe77240a5de7702924c2be0048a42dce | |
| parent | 3e0bc63e1b0ca03493b936e92e871ca7ae451a0a (diff) | |
Fix dmu_recv_stream test for resumablezfs-2.0.5-staging
Use dsl_dataset_has_resume_receive_state()
not dsl_dataset_is_zapified() to check if
stream is resumable.
Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Alek Pinchuk <apinchuk@axcient.com>
Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Signed-off-by: Paul Zuchowski <pzuchowski@datto.com>
Closes #12034
| -rw-r--r-- | module/zfs/dmu_recv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/dmu_recv.c b/module/zfs/dmu_recv.c index b5414749f..f44b39785 100644 --- a/module/zfs/dmu_recv.c +++ b/module/zfs/dmu_recv.c @@ -2878,8 +2878,8 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, offset_t *voffp) int err = 0; struct receive_writer_arg *rwa = kmem_zalloc(sizeof (*rwa), KM_SLEEP); - if (dsl_dataset_is_zapified(drc->drc_ds)) { - uint64_t bytes; + if (dsl_dataset_has_resume_receive_state(drc->drc_ds)) { + uint64_t bytes = 0; (void) zap_lookup(drc->drc_ds->ds_dir->dd_pool->dp_meta_objset, drc->drc_ds->ds_object, DS_FIELD_RESUME_BYTES, sizeof (bytes), 1, &bytes); |