diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-09-19 14:21:25 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-09-19 14:21:25 +0000 |
| commit | 242ed79770c48697d49832e34db641d8e0d1464e (patch) | |
| tree | 01a2155b3292547a70064d7d37af8c70ed631531 | |
| parent | a149c206ad4a0b0845b293a58accc36cc411052f (diff) | |
| parent | 78149ac661d1ba94da655d9464c92bdd323b0ffc (diff) | |
| download | illumos-joyent-242ed79770c48697d49832e34db641d8e0d1464e.tar.gz | |
[illumos-gate merge]
commit 78149ac661d1ba94da655d9464c92bdd323b0ffc
commit 1c2d047073bbce6a9b75c601e17fcaadf4060f52
9829 want interface for posted-interrupt-request IPIs
Conflicts:
usr/src/uts/i86xpv/io/psm/xpv_uppc.c
usr/src/uts/i86xpv/io/psm/xpv_psm.c
usr/src/uts/i86pc/sys/smp_impldefs.h
usr/src/uts/i86pc/sys/psm_types.h
usr/src/uts/i86pc/os/mp_machdep.c
usr/src/uts/i86pc/io/psm/uppc.c
usr/src/uts/i86pc/io/pcplusmp/apic.c
usr/src/uts/i86pc/io/apix/apix.c
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dsl_dataset.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/usr/src/uts/common/fs/zfs/dsl_dataset.c b/usr/src/uts/common/fs/zfs/dsl_dataset.c index fd51f851c4..a08477e29d 100644 --- a/usr/src/uts/common/fs/zfs/dsl_dataset.c +++ b/usr/src/uts/common/fs/zfs/dsl_dataset.c @@ -559,7 +559,6 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uint64_t dsobj, void *tag, dsl_deadlist_close(&ds->ds_deadlist); if (dsl_deadlist_is_open(&ds->ds_remap_deadlist)) dsl_deadlist_close(&ds->ds_remap_deadlist); - dsl_bookmark_fini_ds(ds); if (ds->ds_prev) dsl_dataset_rele(ds->ds_prev, ds); dsl_dir_rele(ds->ds_dir, ds); |