Rename refcount.h to zfs_refcount.h

Renamed to avoid conflicting with refcount.h when a different
implementation is already provided by the platform.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #10620
This commit is contained in:
Matthew Macy 2020-07-29 16:35:33 -07:00 committed by GitHub
parent 843e9ca2e1
commit 27d96d2254
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 28 additions and 40 deletions

View File

@ -116,7 +116,7 @@
#include <sys/dsl_destroy.h> #include <sys/dsl_destroy.h>
#include <sys/dsl_scan.h> #include <sys/dsl_scan.h>
#include <sys/zio_checksum.h> #include <sys/zio_checksum.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/zfeature.h> #include <sys/zfeature.h>
#include <sys/dsl_userhold.h> #include <sys/dsl_userhold.h>
#include <sys/abd.h> #include <sys/abd.h>

View File

@ -119,7 +119,7 @@ extern "C" {
#define __CONST __sun_attr__((__const__)) #define __CONST __sun_attr__((__const__))
#define __PURE __sun_attr__((__pure__)) #define __PURE __sun_attr__((__pure__))
#ifdef INVARIANTS #if defined(INVARIANTS) && !defined(ZFS_DEBUG)
#define ZFS_DEBUG #define ZFS_DEBUG
#undef NDEBUG #undef NDEBUG
#endif #endif

View File

@ -30,7 +30,6 @@
#define _OPENSOLARIS_SYS_FILE_H_ #define _OPENSOLARIS_SYS_FILE_H_
#include <sys/refcount.h> #include <sys/refcount.h>
#include_next <sys/refcount.h>
#include_next <sys/file.h> #include_next <sys/file.h>
#define FKIOCTL 0x80000000 /* ioctl addresses are from kernel */ #define FKIOCTL 0x80000000 /* ioctl addresses are from kernel */

View File

@ -53,7 +53,7 @@ enum symfollow { NO_FOLLOW = NOFOLLOW };
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/cred.h> #include <sys/cred.h>
#include <sys/fcntl.h> #include <sys/fcntl.h>
#include_next <sys/refcount.h> #include <sys/refcount.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/filedesc.h> #include <sys/filedesc.h>
#include <sys/syscallsubr.h> #include <sys/syscallsubr.h>

View File

@ -57,7 +57,6 @@ COMMON_H = \
pathname.h \ pathname.h \
qat.h \ qat.h \
range_tree.h \ range_tree.h \
refcount.h \
rrwlock.h \ rrwlock.h \
sa.h \ sa.h \
sa_impl.h \ sa_impl.h \
@ -111,6 +110,7 @@ COMMON_H = \
zfs_project.h \ zfs_project.h \
zfs_quota.h \ zfs_quota.h \
zfs_ratelimit.h \ zfs_ratelimit.h \
zfs_refcount.h \
zfs_rlock.h \ zfs_rlock.h \
zfs_sa.h \ zfs_sa.h \
zfs_stat.h \ zfs_stat.h \

View File

@ -28,7 +28,7 @@
#include <sys/isa_defs.h> #include <sys/isa_defs.h>
#include <sys/debug.h> #include <sys/debug.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/uio.h> #include <sys/uio.h>
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -36,7 +36,7 @@ extern "C" {
#include <sys/zio.h> #include <sys/zio.h>
#include <sys/dmu.h> #include <sys/dmu.h>
#include <sys/spa.h> #include <sys/spa.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
/* /*
* Used by arc_flush() to inform arc_evict_state() that it should evict * Used by arc_flush() to inform arc_evict_state() that it should evict

View File

@ -34,7 +34,7 @@
#include <sys/zio.h> #include <sys/zio.h>
#include <sys/arc.h> #include <sys/arc.h>
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/zrlock.h> #include <sys/zrlock.h>
#include <sys/multilist.h> #include <sys/multilist.h>

View File

@ -32,7 +32,7 @@
#include <sys/inttypes.h> #include <sys/inttypes.h>
#include <sys/dmu.h> #include <sys/dmu.h>
#include <sys/txg.h> #include <sys/txg.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -32,7 +32,7 @@
#include <sys/spa.h> #include <sys/spa.h>
#include <sys/txg.h> #include <sys/txg.h>
#include <sys/zio.h> #include <sys/zio.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/dmu_zfetch.h> #include <sys/dmu_zfetch.h>
#include <sys/zrlock.h> #include <sys/zrlock.h>
#include <sys/multilist.h> #include <sys/multilist.h>

View File

@ -20,7 +20,7 @@
#define _SYS_DSL_BOOKMARK_H #define _SYS_DSL_BOOKMARK_H
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/dsl_dataset.h> #include <sys/dsl_dataset.h>
#include <sys/dsl_pool.h> #include <sys/dsl_pool.h>

View File

@ -36,7 +36,7 @@
#include <sys/dsl_synctask.h> #include <sys/dsl_synctask.h>
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/dsl_deadlist.h> #include <sys/dsl_deadlist.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/rrwlock.h> #include <sys/rrwlock.h>
#include <sys/dsl_crypt.h> #include <sys/dsl_crypt.h>
#include <zfeature_common.h> #include <zfeature_common.h>

View File

@ -32,7 +32,7 @@
#include <sys/dsl_deadlist.h> #include <sys/dsl_deadlist.h>
#include <sys/dsl_pool.h> #include <sys/dsl_pool.h>
#include <sys/dsl_synctask.h> #include <sys/dsl_synctask.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/dsl_crypt.h> #include <sys/dsl_crypt.h>
#include <sys/bplist.h> #include <sys/bplist.h>

View File

@ -37,7 +37,7 @@ extern "C" {
#include <sys/inttypes.h> #include <sys/inttypes.h>
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
extern uint_t rrw_tsd_key; extern uint_t rrw_tsd_key;

View File

@ -28,7 +28,7 @@
#define _SYS_SA_IMPL_H #define _SYS_SA_IMPL_H
#include <sys/dmu.h> #include <sys/dmu.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/list.h> #include <sys/list.h>
/* /*

View File

@ -44,7 +44,7 @@
#include <sys/uberblock_impl.h> #include <sys/uberblock_impl.h>
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/avl.h> #include <sys/avl.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/bplist.h> #include <sys/bplist.h>
#include <sys/bpobj.h> #include <sys/bpobj.h>
#include <sys/dsl_crypt.h> #include <sys/dsl_crypt.h>

View File

@ -23,8 +23,8 @@
* Copyright (c) 2012, 2015 by Delphix. All rights reserved. * Copyright (c) 2012, 2015 by Delphix. All rights reserved.
*/ */
#ifndef _SYS_REFCOUNT_H #ifndef _SYS_ZFS_REFCOUNT_H
#define _SYS_REFCOUNT_H #define _SYS_ZFS_REFCOUNT_H
#include <sys/inttypes.h> #include <sys/inttypes.h>
#include <sys/list.h> #include <sys/list.h>

View File

@ -21,7 +21,7 @@
#define _SYS_ZIO_CRYPT_H #define _SYS_ZIO_CRYPT_H
#include <sys/dmu.h> #include <sys/dmu.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#if defined(__FreeBSD__) && defined(_KERNEL) #if defined(__FreeBSD__) && defined(_KERNEL)
#include <sys/freebsd_crypto.h> #include <sys/freebsd_crypto.h>
#else #else

View File

@ -33,7 +33,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/spa.h> #include <sys/spa.h>
#include <sys/fs/zfs.h> #include <sys/fs/zfs.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/zfs_ioctl.h> #include <sys/zfs_ioctl.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <libzutil.h> #include <libzutil.h>

View File

@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/vnode.h> #include <sys/vnode.h>
#include <sys/taskq.h>
#include <sys/ccompat.h> #include <sys/ccompat.h>

View File

@ -26,7 +26,7 @@
#include <sys/zio_checksum.h> #include <sys/zio_checksum.h>
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/arc.h> #include <sys/arc.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/vdev.h> #include <sys/vdev.h>
#include <sys/vdev_trim.h> #include <sys/vdev_trim.h>
#include <sys/vdev_impl.h> #include <sys/vdev_impl.h>

View File

@ -26,7 +26,6 @@
#include <sys/dmu.h> #include <sys/dmu.h>
#include <sys/avl.h> #include <sys/avl.h>
#include <sys/zap.h> #include <sys/zap.h>
#include <sys/refcount.h>
#include <sys/nvpair.h> #include <sys/nvpair.h>
#ifdef _KERNEL #ifdef _KERNEL
#include <sys/sid.h> #include <sys/sid.h>

View File

@ -36,6 +36,7 @@
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/vfs.h> #include <sys/vfs.h>
#include <sys/endian.h>
#include <sys/vm.h> #include <sys/vm.h>
#include <sys/vnode.h> #include <sys/vnode.h>
#include <sys/dirent.h> #include <sys/dirent.h>

View File

@ -56,14 +56,13 @@
#include <sys/dmu.h> #include <sys/dmu.h>
#include <sys/dmu_objset.h> #include <sys/dmu_objset.h>
#include <sys/dmu_tx.h> #include <sys/dmu_tx.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/zap.h> #include <sys/zap.h>
#include <sys/zfs_znode.h> #include <sys/zfs_znode.h>
#include <sys/sa.h> #include <sys/sa.h>
#include <sys/zfs_sa.h> #include <sys/zfs_sa.h>
#include <sys/zfs_stat.h> #include <sys/zfs_stat.h>
#include <sys/refcount.h>
#include "zfs_prop.h" #include "zfs_prop.h"
#include "zfs_comutil.h" #include "zfs_comutil.h"

View File

@ -78,7 +78,6 @@
#include <sys/fs/zfs.h> #include <sys/fs/zfs.h>
#include <sys/zfs_ioctl.h> #include <sys/zfs_ioctl.h>
#include <sys/zil.h> #include <sys/zil.h>
#include <sys/refcount.h>
#include <sys/zfs_znode.h> #include <sys/zfs_znode.h>
#include <sys/zfs_rlock.h> #include <sys/zfs_rlock.h>
#include <sys/vdev_impl.h> #include <sys/vdev_impl.h>

View File

@ -33,7 +33,7 @@
#include <sys/zio_checksum.h> #include <sys/zio_checksum.h>
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/arc.h> #include <sys/arc.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/vdev.h> #include <sys/vdev.h>
#include <sys/vdev_trim.h> #include <sys/vdev_trim.h>
#include <sys/vdev_impl.h> #include <sys/vdev_impl.h>

View File

@ -54,7 +54,7 @@
#include <sys/dmu.h> #include <sys/dmu.h>
#include <sys/dmu_objset.h> #include <sys/dmu_objset.h>
#include <sys/dmu_tx.h> #include <sys/dmu_tx.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/zap.h> #include <sys/zap.h>
#include <sys/zfs_znode.h> #include <sys/zfs_znode.h>

View File

@ -284,7 +284,7 @@
#include <sys/zio_checksum.h> #include <sys/zio_checksum.h>
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/arc.h> #include <sys/arc.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/vdev.h> #include <sys/vdev.h>
#include <sys/vdev_impl.h> #include <sys/vdev_impl.h>
#include <sys/dsl_pool.h> #include <sys/dsl_pool.h>

View File

@ -26,7 +26,7 @@
#include <sys/bpobj.h> #include <sys/bpobj.h>
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
#include <sys/dsl_pool.h> #include <sys/dsl_pool.h>
#include <sys/zfeature.h> #include <sys/zfeature.h>
#include <sys/zap.h> #include <sys/zap.h>

View File

@ -33,7 +33,6 @@
#include <sys/dsl_dir.h> #include <sys/dsl_dir.h>
#include <sys/dsl_pool.h> #include <sys/dsl_pool.h>
#include <sys/dnode.h> #include <sys/dnode.h>
#include <sys/refcount.h>
#include <sys/spa.h> #include <sys/spa.h>
/* /*

View File

@ -25,7 +25,6 @@
*/ */
#include <sys/dmu.h> #include <sys/dmu.h>
#include <sys/refcount.h>
#include <sys/zap.h> #include <sys/zap.h>
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/dsl_pool.h> #include <sys/dsl_pool.h>

View File

@ -24,7 +24,7 @@
*/ */
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/refcount.h> #include <sys/zfs_refcount.h>
/* /*
* Reference count tracking is disabled by default. It's memory requirements * Reference count tracking is disabled by default. It's memory requirements

View File

@ -26,7 +26,6 @@
* Copyright (c) 2012 by Delphix. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved.
*/ */
#include <sys/refcount.h>
#include <sys/rrwlock.h> #include <sys/rrwlock.h>
#include <sys/trace_zfs.h> #include <sys/trace_zfs.h>

View File

@ -34,7 +34,6 @@
#include <sys/dsl_pool.h> #include <sys/dsl_pool.h>
#include <sys/zio.h> #include <sys/zio.h>
#include <sys/space_map.h> #include <sys/space_map.h>
#include <sys/refcount.h>
#include <sys/zfeature.h> #include <sys/zfeature.h>
/* /*

View File

@ -27,7 +27,6 @@
#include <sys/zio.h> #include <sys/zio.h>
#include <sys/zio_checksum.h> #include <sys/zio_checksum.h>
#include <sys/metaslab.h> #include <sys/metaslab.h>
#include <sys/refcount.h>
#include <sys/dmu.h> #include <sys/dmu.h>
#include <sys/vdev_indirect_mapping.h> #include <sys/vdev_indirect_mapping.h>
#include <sys/dmu_tx.h> #include <sys/dmu_tx.h>

View File

@ -27,7 +27,6 @@
#include <sys/spa_impl.h> #include <sys/spa_impl.h>
#include <sys/txg.h> #include <sys/txg.h>
#include <sys/vdev_impl.h> #include <sys/vdev_impl.h>
#include <sys/refcount.h>
#include <sys/metaslab_impl.h> #include <sys/metaslab_impl.h>
#include <sys/dsl_synctask.h> #include <sys/dsl_synctask.h>
#include <sys/zap.h> #include <sys/zap.h>

View File

@ -29,7 +29,6 @@
#include <sys/txg.h> #include <sys/txg.h>
#include <sys/vdev_impl.h> #include <sys/vdev_impl.h>
#include <sys/vdev_trim.h> #include <sys/vdev_trim.h>
#include <sys/refcount.h>
#include <sys/metaslab_impl.h> #include <sys/metaslab_impl.h>
#include <sys/dsl_synctask.h> #include <sys/dsl_synctask.h>
#include <sys/zap.h> #include <sys/zap.h>

View File

@ -45,7 +45,6 @@
#include <sys/zfs_znode.h> #include <sys/zfs_znode.h>
#include <sys/fs/zfs.h> #include <sys/fs/zfs.h>
#include <sys/zap.h> #include <sys/zap.h>
#include <sys/refcount.h>
#include <sys/zap_impl.h> #include <sys/zap_impl.h>
#include <sys/zap_leaf.h> #include <sys/zap_leaf.h>

View File

@ -31,7 +31,6 @@
#include <sys/dmu.h> #include <sys/dmu.h>
#include <sys/zfs_context.h> #include <sys/zfs_context.h>
#include <sys/zap.h> #include <sys/zap.h>
#include <sys/refcount.h>
#include <sys/zap_impl.h> #include <sys/zap_impl.h>
#include <sys/zap_leaf.h> #include <sys/zap_leaf.h>
#include <sys/avl.h> #include <sys/avl.h>

View File

@ -26,7 +26,6 @@
#include <sys/dmu.h> #include <sys/dmu.h>
#include <sys/avl.h> #include <sys/avl.h>
#include <sys/zap.h> #include <sys/zap.h>
#include <sys/refcount.h>
#include <sys/nvpair.h> #include <sys/nvpair.h>
#ifdef _KERNEL #ifdef _KERNEL
#include <sys/sid.h> #include <sys/sid.h>