diff options
author | Tom Caputi <tcaputi@datto.com> | 2018-04-10 14:15:05 -0400 |
---|---|---|
committer | Toomas Soome <tsoome@me.com> | 2019-03-27 15:27:22 +0200 |
commit | aa02ea01948372a32cbf08bfc31c72c32e3fc81e (patch) | |
tree | f728b63085d7b1aae476ffbb65c018772d3059c9 /usr/src/uts/common/fs/zfs/sys/dnode.h | |
parent | 619a0f6c7269dc1950adc2e401a36d843dd9fa02 (diff) | |
download | illumos-joyent-aa02ea01948372a32cbf08bfc31c72c32e3fc81e.tar.gz |
10572 Fix race in dnode_check_slots_free()
10579 Don't allow dnode allocation if dn_holds != 0
Reviewed by: Kody Kantor <kody.kantor@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts/common/fs/zfs/sys/dnode.h')
-rw-r--r-- | usr/src/uts/common/fs/zfs/sys/dnode.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/uts/common/fs/zfs/sys/dnode.h b/usr/src/uts/common/fs/zfs/sys/dnode.h index 167ae789b6..3b7d619172 100644 --- a/usr/src/uts/common/fs/zfs/sys/dnode.h +++ b/usr/src/uts/common/fs/zfs/sys/dnode.h @@ -296,6 +296,7 @@ struct dnode { uint64_t dn_allocated_txg; uint64_t dn_free_txg; uint64_t dn_assigned_txg; + uint64_t dn_dirty_txg; /* txg dnode was last dirtied */ kcondvar_t dn_notxholds; enum dnode_dirtycontext dn_dirtyctx; uint8_t *dn_dirtyctx_firstset; /* dbg: contents meaningless */ @@ -399,6 +400,9 @@ void dnode_evict_bonus(dnode_t *dn); void dnode_free_interior_slots(dnode_t *dn); boolean_t dnode_needs_remap(const dnode_t *dn); +#define DNODE_IS_DIRTY(_dn) \ + ((_dn)->dn_dirty_txg >= spa_syncing_txg((_dn)->dn_objset->os_spa)) + #define DNODE_IS_CACHEABLE(_dn) \ ((_dn)->dn_objset->os_primary_cache == ZFS_CACHE_ALL || \ (DMU_OT_IS_METADATA((_dn)->dn_type) && \ |