diff options
| author | Tim Schumacher <[email protected]> | 2018-09-26 19:29:26 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-09-26 10:29:26 -0700 |
| commit | c13060e4787e9578dafad85a47c62457424bec9c (patch) | |
| tree | bf05ff868e01b6d607a234026a659ff4b5e1a789 /module/zfs/dsl_crypt.c | |
| parent | 7a23c81342df05ace730bd303b4a73854dba43dd (diff) | |
Linux 4.19-rc3+ compat: Remove refcount_t compat
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 <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tim Schumacher <[email protected]>
Closes #7885
Closes #7932
Diffstat (limited to 'module/zfs/dsl_crypt.c')
| -rw-r--r-- | module/zfs/dsl_crypt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/module/zfs/dsl_crypt.c b/module/zfs/dsl_crypt.c index f0878c934..6beb958c1 100644 --- a/module/zfs/dsl_crypt.c +++ b/module/zfs/dsl_crypt.c @@ -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); |