c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-24 19:28:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

freebsd: changes necessary to coexist with dtrace in tree

Browse Source 
Fix header conflicts when building zfs with openzfs as a vendor import.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #10497
This commit is contained in:
Matthew Macy
2020-07-01 09:10:08 -07:00
committed by GitHub
parent 22831636c8
commit 7ddb753d17
13 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/os/freebsd/spl/sys/ccompile.h
+7 -3
View File
@@ -160,11 +160,13 @@ extern "C" {
#define KMALLOC_MAX_SIZE MAXPHYS
#ifdef _KERNEL
#if !defined(LOCORE) && !defined(_ASM)
typedef unsigned long long u_longlong_t;
typedef long long longlong_t;
#include <linux/types.h>
typedef void zfs_kernel_param_t;
#endif
#define param_set_charp(a, b) (0)
#define ATTR_UID AT_UID
#define ATTR_GID AT_GID
@@ -179,6 +181,9 @@ typedef void zfs_kernel_param_t;
#define MUTEX_NOLOCKDEP 0
#define RW_NOLOCKDEP 0
#if !defined(LOCORE) && !defined(_ASM)
#include <sys/param.h>
#include <linux/types.h>
#if __FreeBSD_version < 1300051
#define vm_page_valid(m) (m)->valid = VM_PAGE_BITS_ALL
@@ -207,7 +212,6 @@ typedef void zfs_kernel_param_t;
#else
#define getnewvnode_reserve_() getnewvnode_reserve(1)
#endif
struct hlist_node {
struct hlist_node *next, **pprev;
};
@@ -288,7 +292,7 @@ atomic_dec(atomic_t *v)
{
return (atomic_fetchadd_int(&v->counter, -1) - 1);
}
#endif
#else
typedef long loff_t;
typedef long rlim64_t;