diff options
| author | Matthew Macy <[email protected]> | 2020-07-29 16:35:33 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-29 16:35:33 -0700 |
| commit | 27d96d22542282b81a055e2108268dc78d08eda8 (patch) | |
| tree | 56926ce22cb377e4de917dae56022faca7c080e7 /include/os | |
| parent | 843e9ca2e1ef347cf6b0271ed84438afc145dfd4 (diff) | |
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 <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes #10620
Diffstat (limited to 'include/os')
| -rw-r--r-- | include/os/freebsd/spl/sys/ccompile.h | 2 | ||||
| -rw-r--r-- | include/os/freebsd/spl/sys/file.h | 1 | ||||
| -rw-r--r-- | include/os/freebsd/spl/sys/vnode.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/os/freebsd/spl/sys/ccompile.h b/include/os/freebsd/spl/sys/ccompile.h index cfb94268b..c594c928f 100644 --- a/include/os/freebsd/spl/sys/ccompile.h +++ b/include/os/freebsd/spl/sys/ccompile.h @@ -119,7 +119,7 @@ extern "C" { #define __CONST __sun_attr__((__const__)) #define __PURE __sun_attr__((__pure__)) -#ifdef INVARIANTS +#if defined(INVARIANTS) && !defined(ZFS_DEBUG) #define ZFS_DEBUG #undef NDEBUG #endif diff --git a/include/os/freebsd/spl/sys/file.h b/include/os/freebsd/spl/sys/file.h index 0d0be44f8..51e59b113 100644 --- a/include/os/freebsd/spl/sys/file.h +++ b/include/os/freebsd/spl/sys/file.h @@ -30,7 +30,6 @@ #define _OPENSOLARIS_SYS_FILE_H_ #include <sys/refcount.h> -#include_next <sys/refcount.h> #include_next <sys/file.h> #define FKIOCTL 0x80000000 /* ioctl addresses are from kernel */ diff --git a/include/os/freebsd/spl/sys/vnode.h b/include/os/freebsd/spl/sys/vnode.h index e330bc079..b9fae99ad 100644 --- a/include/os/freebsd/spl/sys/vnode.h +++ b/include/os/freebsd/spl/sys/vnode.h @@ -53,7 +53,7 @@ enum symfollow { NO_FOLLOW = NOFOLLOW }; #include <sys/mount.h> #include <sys/cred.h> #include <sys/fcntl.h> -#include_next <sys/refcount.h> +#include <sys/refcount.h> #include <sys/file.h> #include <sys/filedesc.h> #include <sys/syscallsubr.h> |