From 424fd7c3e080255935646d2beaa2655c116cc37a Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Mon, 1 Oct 2018 19:42:05 +0200 Subject: Prefix all refcount functions with zfs_ Recent changes in the Linux kernel made it necessary to prefix the refcount_add() function with zfs_ due to a name collision. To bring the other functions in line with that and to avoid future collisions, prefix the other refcount functions as well. Reviewed by: Matthew Ahrens Reviewed-by: Brian Behlendorf Signed-off-by: Tim Schumacher Closes #7963 --- module/zfs/dnode_sync.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/zfs/dnode_sync.c') diff --git a/module/zfs/dnode_sync.c b/module/zfs/dnode_sync.c index f0459e47d..d1f28700d 100644 --- a/module/zfs/dnode_sync.c +++ b/module/zfs/dnode_sync.c @@ -441,7 +441,7 @@ dnode_evict_dbufs(dnode_t *dn) mutex_enter(&db->db_mtx); if (db->db_state != DB_EVICTING && - refcount_is_zero(&db->db_holds)) { + zfs_refcount_is_zero(&db->db_holds)) { db_marker->db_level = db->db_level; db_marker->db_blkid = db->db_blkid; db_marker->db_state = DB_SEARCH; @@ -483,7 +483,7 @@ dnode_evict_bonus(dnode_t *dn) { rw_enter(&dn->dn_struct_rwlock, RW_WRITER); if (dn->dn_bonus != NULL) { - if (refcount_is_zero(&dn->dn_bonus->db_holds)) { + if (zfs_refcount_is_zero(&dn->dn_bonus->db_holds)) { mutex_enter(&dn->dn_bonus->db_mtx); dbuf_destroy(dn->dn_bonus); dn->dn_bonus = NULL; @@ -549,7 +549,7 @@ dnode_sync_free(dnode_t *dn, dmu_tx_t *tx) * zfs_obj_to_path() also depends on this being * commented out. * - * ASSERT3U(refcount_count(&dn->dn_holds), ==, 1); + * ASSERT3U(zfs_refcount_count(&dn->dn_holds), ==, 1); */ /* Undirty next bits */ -- cgit v1.2.3