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 /cmd | |
| 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 'cmd')
| -rw-r--r-- | cmd/ztest/ztest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 83d057a74..ae25957dc 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -1323,7 +1323,7 @@ ztest_dmu_objset_own(const char *name, dmu_objset_type_t type, */ typedef struct { list_node_t z_lnode; - refcount_t z_refcnt; + zfs_refcount_t z_refcnt; uint64_t z_object; zfs_rlock_t z_range_lock; } ztest_znode_t; @@ -1382,13 +1382,13 @@ ztest_znode_get(ztest_ds_t *zd, uint64_t object) for (zp = list_head(&zll->z_list); (zp); zp = list_next(&zll->z_list, zp)) { if (zp->z_object == object) { - refcount_add(&zp->z_refcnt, RL_TAG); + zfs_refcount_add(&zp->z_refcnt, RL_TAG); break; } } if (zp == NULL) { zp = ztest_znode_init(object); - refcount_add(&zp->z_refcnt, RL_TAG); + zfs_refcount_add(&zp->z_refcnt, RL_TAG); list_insert_head(&zll->z_list, zp); } mutex_exit(&zll->z_lock); |