c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Linux 4.19-rc3+ compat: Remove refcount_t compat

Browse Source 
torvalds/linux@59b57717f ("blkcg: delay blkg destruction until
after writeback has finished") added a refcount_t to the blkcg
structure. Due to the refcount_t compatibility code, zfs_refcount_t
was used by mistake.

Resolve this by removing the compatibility code and replacing the
occurrences of refcount_t with zfs_refcount_t.

Reviewed-by: Franz Pletz <fpletz@fnordicwalking.de>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tim Schumacher <timschumi@gmx.de>
Closes #7885 
Closes #7932
This commit is contained in:
Tim Schumacher
2018-09-26 19:29:26 +02:00
committed by Brian Behlendorf
parent 7a23c81342
commit c13060e478
32 changed files with 115 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zfs/dsl_crypt.c
+6 -6
View File
@@ -74,7 +74,7 @@
static void
dsl_wrapping_key_hold(dsl_wrapping_key_t *wkey, void *tag)
{
(void) refcount_add(&wkey->wk_refcnt, tag);
(void) zfs_refcount_add(&wkey->wk_refcnt, tag);
}
static void
@@ -605,7 +605,7 @@ dsl_crypto_key_open(objset_t *mos, dsl_wrapping_key_t *wkey,
dsl_wrapping_key_hold(wkey, dck);
dck->dck_wkey = wkey;
dck->dck_obj = dckobj;
refcount_add(&dck->dck_holds, tag);
zfs_refcount_add(&dck->dck_holds, tag);
*dck_out = dck;
return (0);
@@ -641,7 +641,7 @@ spa_keystore_dsl_key_hold_impl(spa_t *spa, uint64_t dckobj, void *tag,
}
/* increment the refcount */
refcount_add(&found_dck->dck_holds, tag);
zfs_refcount_add(&found_dck->dck_holds, tag);
*dck_out = found_dck;
return (0);
@@ -970,9 +970,9 @@ spa_keystore_create_mapping_impl(spa_t *spa, uint64_t dsobj,
found_km = avl_find(&spa->spa_keystore.sk_key_mappings, km, &where);
if (found_km != NULL) {
should_free = B_TRUE;
refcount_add(&found_km->km_refcnt, tag);
zfs_refcount_add(&found_km->km_refcnt, tag);
} else {
refcount_add(&km->km_refcnt, tag);
zfs_refcount_add(&km->km_refcnt, tag);
avl_insert(&spa->spa_keystore.sk_key_mappings, km, where);
}
@@ -1072,7 +1072,7 @@ spa_keystore_lookup_key(spa_t *spa, uint64_t dsobj, void *tag,
}
if (found_km && tag)
refcount_add(&found_km->km_key->dck_holds, tag);
zfs_refcount_add(&found_km->km_key->dck_holds, tag);
rw_exit(&spa->spa_keystore.sk_km_lock);