d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix up r353565, somehow a few files did not get committed

Browse Source 
MFC after:	3 weeks
X-MFC with:	r353565
This commit is contained in:
Andriy Gapon 2019-10-15 15:52:01 +00:00
parent 237c1f932b
commit 67f8ab8ebb
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf_stats.c
View File

@ -90,7 +90,7 @@ __dbuf_stats_hash_table_data(char *buf, size_t size, dmu_buf_impl_t *db)
(u_longlong_t)db->db.db_size, (u_longlong_t)db->db.db_size,
!!dbuf_is_metadata(db), !!dbuf_is_metadata(db),
db->db_state, db->db_state,
(ulong_t)refcount_count(&db->db_holds), (ulong_t)zfs_refcount_count(&db->db_holds),
/* arc_buf_info_t */ /* arc_buf_info_t */
abi.abi_state_type, abi.abi_state_type,
abi.abi_state_contents, abi.abi_state_contents,
@ -115,7 +115,7 @@ __dbuf_stats_hash_table_data(char *buf, size_t size, dmu_buf_impl_t *db)
(ulong_t)doi.doi_metadata_block_size, (ulong_t)doi.doi_metadata_block_size,
(u_longlong_t)doi.doi_bonus_size, (u_longlong_t)doi.doi_bonus_size,
(ulong_t)doi.doi_indirection, (ulong_t)doi.doi_indirection,
(ulong_t)refcount_count(&dn->dn_holds), (ulong_t)zfs_refcount_count(&dn->dn_holds),
(u_longlong_t)doi.doi_fill_count, (u_longlong_t)doi.doi_fill_count,
(u_longlong_t)doi.doi_max_offset); (u_longlong_t)doi.doi_max_offset);
buf[size] = '\0'; buf[size] = '\0';

12
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
View File

@ -318,7 +318,7 @@ struct dsl_scan_io_queue {
/* private data for dsl_scan_prefetch_cb() */ /* private data for dsl_scan_prefetch_cb() */
typedef struct scan_prefetch_ctx { typedef struct scan_prefetch_ctx {
refcount_t spc_refcnt; /* refcount for memory management */ zfs_refcount_t spc_refcnt; /* refcount for memory management */
dsl_scan_t *spc_scn; /* dsl_scan_t for the pool */ dsl_scan_t *spc_scn; /* dsl_scan_t for the pool */
boolean_t spc_root; /* is this prefetch for an objset? */ boolean_t spc_root; /* is this prefetch for an objset? */
uint8_t spc_indblkshift; /* dn_indblkshift of current dnode */ uint8_t spc_indblkshift; /* dn_indblkshift of current dnode */
@ -1326,8 +1326,8 @@ scan_prefetch_queue_compare(const void *a, const void *b)
static void static void
scan_prefetch_ctx_rele(scan_prefetch_ctx_t *spc, void *tag) scan_prefetch_ctx_rele(scan_prefetch_ctx_t *spc, void *tag)
{ {
if (refcount_remove(&spc->spc_refcnt, tag) == 0) { if (zfs_refcount_remove(&spc->spc_refcnt, tag) == 0) {
refcount_destroy(&spc->spc_refcnt); zfs_refcount_destroy(&spc->spc_refcnt);
kmem_free(spc, sizeof (scan_prefetch_ctx_t)); kmem_free(spc, sizeof (scan_prefetch_ctx_t));
} }
} }
@ -1338,8 +1338,8 @@ scan_prefetch_ctx_create(dsl_scan_t *scn, dnode_phys_t *dnp, void *tag)
scan_prefetch_ctx_t *spc; scan_prefetch_ctx_t *spc;
spc = kmem_alloc(sizeof (scan_prefetch_ctx_t), KM_SLEEP); spc = kmem_alloc(sizeof (scan_prefetch_ctx_t), KM_SLEEP);
refcount_create(&spc->spc_refcnt); zfs_refcount_create(&spc->spc_refcnt);
refcount_add(&spc->spc_refcnt, tag); zfs_refcount_add(&spc->spc_refcnt, tag);
spc->spc_scn = scn; spc->spc_scn = scn;
if (dnp != NULL) { if (dnp != NULL) {
spc->spc_datablkszsec = dnp->dn_datablkszsec; spc->spc_datablkszsec = dnp->dn_datablkszsec;
@ -1357,7 +1357,7 @@ scan_prefetch_ctx_create(dsl_scan_t *scn, dnode_phys_t *dnp, void *tag)
static void static void
scan_prefetch_ctx_add_ref(scan_prefetch_ctx_t *spc, void *tag) scan_prefetch_ctx_add_ref(scan_prefetch_ctx_t *spc, void *tag)
{ {
refcount_add(&spc->spc_refcnt, tag); zfs_refcount_add(&spc->spc_refcnt, tag);
} }
static boolean_t static boolean_t

2
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
View File

@ -86,7 +86,7 @@ struct arc_prune {
void *p_private; void *p_private;
uint64_t p_adjust; uint64_t p_adjust;
list_node_t p_node; list_node_t p_node;
refcount_t p_refcnt; zfs_refcount_t p_refcnt;
}; };
typedef enum arc_strategy { typedef enum arc_strategy {