From c13060e4787e9578dafad85a47c62457424bec9c Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Wed, 26 Sep 2018 19:29:26 +0200 Subject: 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 Reviewed-by: Brian Behlendorf Signed-off-by: Tim Schumacher Closes #7885 Closes #7932 --- include/sys/dbuf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/sys/dbuf.h') diff --git a/include/sys/dbuf.h b/include/sys/dbuf.h index ab0950c83..eea9e265b 100644 --- a/include/sys/dbuf.h +++ b/include/sys/dbuf.h @@ -230,7 +230,7 @@ typedef struct dmu_buf_impl { * If nonzero, the buffer can't be destroyed. * Protected by db_mtx. */ - refcount_t db_holds; + zfs_refcount_t db_holds; /* buffer holding our data */ arc_buf_t *db_buf; -- cgit v1.2.3