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/dsl_dataset.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/dsl_dataset.c')
| -rw-r--r-- | module/zfs/dsl_dataset.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c index 7546a0765..36715b8a2 100644 --- a/module/zfs/dsl_dataset.c +++ b/module/zfs/dsl_dataset.c @@ -339,7 +339,7 @@ dsl_dataset_evict_async(void *dbu) mutex_destroy(&ds->ds_opening_lock); mutex_destroy(&ds->ds_sendstream_lock); mutex_destroy(&ds->ds_remap_deadlist_lock); - refcount_destroy(&ds->ds_longholds); + zfs_refcount_destroy(&ds->ds_longholds); rrw_destroy(&ds->ds_bp_rwlock); kmem_free(ds, sizeof (dsl_dataset_t)); @@ -484,7 +484,7 @@ dsl_dataset_hold_obj_flags(dsl_pool_t *dp, uint64_t dsobj, mutex_init(&ds->ds_remap_deadlist_lock, NULL, MUTEX_DEFAULT, NULL); rrw_init(&ds->ds_bp_rwlock, B_FALSE); - refcount_create(&ds->ds_longholds); + zfs_refcount_create(&ds->ds_longholds); bplist_create(&ds->ds_pending_deadlist); @@ -577,7 +577,7 @@ dsl_dataset_hold_obj_flags(dsl_pool_t *dp, uint64_t dsobj, mutex_destroy(&ds->ds_lock); mutex_destroy(&ds->ds_opening_lock); mutex_destroy(&ds->ds_sendstream_lock); - refcount_destroy(&ds->ds_longholds); + zfs_refcount_destroy(&ds->ds_longholds); kmem_free(ds, sizeof (dsl_dataset_t)); if (err != 0) { dmu_buf_rele(dbuf, tag); @@ -733,14 +733,14 @@ dsl_dataset_long_hold(dsl_dataset_t *ds, void *tag) void dsl_dataset_long_rele(dsl_dataset_t *ds, void *tag) { - (void) refcount_remove(&ds->ds_longholds, tag); + (void) zfs_refcount_remove(&ds->ds_longholds, tag); } /* Return B_TRUE if there are any long holds on this dataset. */ boolean_t dsl_dataset_long_held(dsl_dataset_t *ds) { - return (!refcount_is_zero(&ds->ds_longholds)); + return (!zfs_refcount_is_zero(&ds->ds_longholds)); } void |