diff options
| author | Olaf Faaland <[email protected]> | 2017-02-28 16:10:18 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-02-28 16:10:18 -0800 |
| commit | 4859fe796c5b03687a7b2ab3735b882c4f5cad66 (patch) | |
| tree | 197549665cc7fe999404a268da9fc6d44501b308 /module | |
| parent | 912e2ba92f45b61df476e7e15da33e0ea3eb0ae5 (diff) | |
Linux 4.11 compat: avoid refcount_t name conflict
Linux 4.11 introduces a new type, refcount_t, which conflicts with the
type of the same name defined within ZFS.
Rename the ZFS type zfs_refcount_t. Within the ZFS code, use a macro to
cause references to refcount_t to be changed to zfs_refcount_t at
compile time. This reduces conflicts when later landing OpenZFS
patches.
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Olaf Faaland <[email protected]>
Closes #5823
Closes #5842
Diffstat (limited to 'module')
| -rw-r--r-- | module/zfs/refcount.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/refcount.c b/module/zfs/refcount.c index b33874714..a151aceae 100644 --- a/module/zfs/refcount.c +++ b/module/zfs/refcount.c @@ -143,7 +143,7 @@ refcount_add_many(refcount_t *rc, uint64_t number, void *holder) } int64_t -refcount_add(refcount_t *rc, void *holder) +zfs_refcount_add(refcount_t *rc, void *holder) { return (refcount_add_many(rc, 1, holder)); } |