diff options
| author | Matthew Macy <[email protected]> | 2019-12-04 13:12:57 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-12-04 13:12:57 -0800 |
| commit | be627fc84711d2382d179392e3313f9fda8d24a3 (patch) | |
| tree | 682926e925cdbd5bad6df0d2a8f16c48ec9ca7e3 /include/sys/zfs_context.h | |
| parent | 618b6adfbf136b3b61c6366719650ccfbad189a4 (diff) | |
Refactor zfs_context.h to build on FreeBSD
- on Linux move Linux specific headers to zfs_context_os.h
- on FreeBSD move FreeBSD specific definitions to zfs_context_os.h
- remove duplicate tsd_ definitions
- remove unused AT_TYPE
Reviewed-by: Jorgen Lundman <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Don Brady <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes #9668
Diffstat (limited to 'include/sys/zfs_context.h')
| -rw-r--r-- | include/sys/zfs_context.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h index c14d92a2c..5a67ca677 100644 --- a/include/sys/zfs_context.h +++ b/include/sys/zfs_context.h @@ -29,7 +29,6 @@ #define _SYS_ZFS_CONTEXT_H #ifdef __KERNEL__ - #include <sys/note.h> #include <sys/types.h> #include <sys/atomic.h> @@ -48,7 +47,6 @@ #include <sys/strings.h> #include <sys/byteorder.h> #include <sys/list.h> -#include <sys/uio_impl.h> #include <sys/time.h> #include <sys/zone.h> #include <sys/kstat.h> @@ -61,11 +59,8 @@ #include <sys/disp.h> #include <sys/trace.h> #include <sys/procfs_list.h> -#include <linux/dcache_compat.h> -#include <linux/utsname_compat.h> #include <sys/mod.h> -#include <sys/sysmacros.h> - +#include <sys/zfs_context_os.h> #else /* _KERNEL */ #define _SYS_MUTEX_H @@ -88,7 +83,6 @@ #include <pthread.h> #include <setjmp.h> #include <assert.h> -#include <alloca.h> #include <umem.h> #include <limits.h> #include <atomic.h> @@ -101,7 +95,6 @@ #include <sys/types.h> #include <sys/cred.h> #include <sys/sysmacros.h> -#include <sys/bitmap.h> #include <sys/resource.h> #include <sys/byteorder.h> #include <sys/list.h> @@ -117,6 +110,8 @@ #include <sys/utsname.h> #include <sys/trace_zfs.h> +#include <sys/zfs_context_os.h> + /* * Stack */ @@ -333,15 +328,7 @@ extern void cv_broadcast(kcondvar_t *cv); */ #define tsd_get(k) pthread_getspecific(k) #define tsd_set(k, v) pthread_setspecific(k, v) -#define tsd_create(kp, d) pthread_key_create(kp, d) -#define tsd_destroy(kp) /* nothing */ - -/* - * Thread-specific data - */ -#define tsd_get(k) pthread_getspecific(k) -#define tsd_set(k, v) pthread_setspecific(k, v) -#define tsd_create(kp, d) pthread_key_create(kp, d) +#define tsd_create(kp, d) pthread_key_create((pthread_key_t *)kp, d) #define tsd_destroy(kp) /* nothing */ /* @@ -562,7 +549,6 @@ typedef struct vsecattr { size_t vsa_aclentsz; /* ACE size in bytes of vsa_aclentp */ } vsecattr_t; -#define AT_TYPE 0x00001 #define AT_MODE 0x00002 #define AT_UID 0x00004 #define AT_GID 0x00008 |