diff options
| author | Andriy Gapon <[email protected]> | 2018-02-21 14:55:55 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-03-30 12:00:40 -0700 |
| commit | 5e00213e430fe9103e263514490d55d10075908e (patch) | |
| tree | 7447d888344a6afcf29932f84dfd0b5bc8490d8d /include/sys/dmu_objset.h | |
| parent | 99f505a4d743976d8879595d20beb66a6cbc3af1 (diff) | |
OpenZFS 9164 - assert: newds == os->os_dsl_dataset
Authored by: Andriy Gapon <[email protected]>
Reviewed by: Matt Ahrens <[email protected]>
Reviewed by: Don Brady <[email protected]>
Reviewed-by: loli10K <[email protected]>
Reviewed-by: Tony Hutter <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Approved by: Richard Lowe <[email protected]>
Ported-by: Giuseppe Di Natale <[email protected]>
Porting Notes:
* Re-enabled and tweaked the zpool_upgrade_007_pos test case
to successfully run in under 5 minutes.
OpenZFS-issue: https://www.illumos.org/issues/9164
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/0e776dc06a
Closes #6112
Closes #7336
Diffstat (limited to 'include/sys/dmu_objset.h')
| -rw-r--r-- | include/sys/dmu_objset.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sys/dmu_objset.h b/include/sys/dmu_objset.h index 0060efd51..54fe37e61 100644 --- a/include/sys/dmu_objset.h +++ b/include/sys/dmu_objset.h @@ -194,8 +194,8 @@ int dmu_objset_own(const char *name, dmu_objset_type_t type, int dmu_objset_own_obj(struct dsl_pool *dp, uint64_t obj, dmu_objset_type_t type, boolean_t readonly, boolean_t decrypt, void *tag, objset_t **osp); -void dmu_objset_refresh_ownership(objset_t *os, boolean_t key_needed, - void *tag); +void dmu_objset_refresh_ownership(struct dsl_dataset *ds, + struct dsl_dataset **newds, boolean_t decrypt, void *tag); void dmu_objset_rele(objset_t *os, void *tag); void dmu_objset_rele_flags(objset_t *os, boolean_t decrypt, void *tag); void dmu_objset_disown(objset_t *os, boolean_t decrypt, void *tag); |