summaryrefslogtreecommitdiffstats
path: root/include/sys/dmu_tx.h
diff options
context:
space:
mode:
authorTim Schumacher <[email protected]>2018-09-26 19:29:26 +0200
committerBrian Behlendorf <[email protected]>2018-09-26 10:29:26 -0700
commitc13060e4787e9578dafad85a47c62457424bec9c (patch)
treebf05ff868e01b6d607a234026a659ff4b5e1a789 /include/sys/dmu_tx.h
parent7a23c81342df05ace730bd303b4a73854dba43dd (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 'include/sys/dmu_tx.h')
-rw-r--r--include/sys/dmu_tx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sys/dmu_tx.h b/include/sys/dmu_tx.h
index 6a4bd3fac..36d205e95 100644
--- a/include/sys/dmu_tx.h
+++ b/include/sys/dmu_tx.h
@@ -97,8 +97,8 @@ typedef struct dmu_tx_hold {
dmu_tx_t *txh_tx;
list_node_t txh_node;
struct dnode *txh_dnode;
- refcount_t txh_space_towrite;
- refcount_t txh_memory_tohold;
+ zfs_refcount_t txh_space_towrite;
+ zfs_refcount_t txh_memory_tohold;
enum dmu_tx_hold_type txh_type;
uint64_t txh_arg1;
uint64_t txh_arg2;