diff options
| author | Tim Schumacher <[email protected]> | 2018-10-01 19:42:05 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-10-01 10:42:05 -0700 |
| commit | 424fd7c3e080255935646d2beaa2655c116cc37a (patch) | |
| tree | 16618fd0366f3c6431bfdb8b531a96764535ee54 /module/zfs/spa.c | |
| parent | fc23d59fa09f3cd803438986ba70ffcb32b8a036 (diff) | |
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 <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tim Schumacher <[email protected]>
Closes #7963
Diffstat (limited to 'module/zfs/spa.c')
| -rw-r--r-- | module/zfs/spa.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/module/zfs/spa.c b/module/zfs/spa.c index 7bf9cde5b..eaca2d29e 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -2371,7 +2371,7 @@ spa_load(spa_t *spa, spa_load_state_t state, spa_import_type_t type) * and are making their way through the eviction process. */ spa_evicting_os_wait(spa); - spa->spa_minref = refcount_count(&spa->spa_refcount); + spa->spa_minref = zfs_refcount_count(&spa->spa_refcount); if (error) { if (error != EEXIST) { spa->spa_loaded_ts.tv_sec = 0; @@ -5278,7 +5278,7 @@ spa_create(const char *pool, nvlist_t *nvroot, nvlist_t *props, * and are making their way through the eviction process. */ spa_evicting_os_wait(spa); - spa->spa_minref = refcount_count(&spa->spa_refcount); + spa->spa_minref = zfs_refcount_count(&spa->spa_refcount); spa->spa_load_state = SPA_LOAD_NONE; mutex_exit(&spa_namespace_lock); @@ -7769,7 +7769,8 @@ spa_sync(spa_t *spa, uint64_t txg) * allocations all happen from spa_sync(). */ for (int i = 0; i < spa->spa_alloc_count; i++) - ASSERT0(refcount_count(&(mg->mg_alloc_queue_depth[i]))); + ASSERT0(zfs_refcount_count( + &(mg->mg_alloc_queue_depth[i]))); mg->mg_max_alloc_queue_depth = max_queue_depth; for (int i = 0; i < spa->spa_alloc_count; i++) { @@ -7780,9 +7781,9 @@ spa_sync(spa_t *spa, uint64_t txg) } for (int i = 0; i < spa->spa_alloc_count; i++) { - ASSERT0(refcount_count(&normal->mc_alloc_slots[i])); - ASSERT0(refcount_count(&special->mc_alloc_slots[i])); - ASSERT0(refcount_count(&dedup->mc_alloc_slots[i])); + ASSERT0(zfs_refcount_count(&normal->mc_alloc_slots[i])); + ASSERT0(zfs_refcount_count(&special->mc_alloc_slots[i])); + ASSERT0(zfs_refcount_count(&dedup->mc_alloc_slots[i])); normal->mc_alloc_max_slots[i] = slots_per_allocator; special->mc_alloc_max_slots[i] = slots_per_allocator; dedup->mc_alloc_max_slots[i] = slots_per_allocator; |