c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 10:37:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changes to make openzfs build within FreeBSD buildworld

Browse Source 
A collection of header changes to enable FreeBSD to build
with vendored OpenZFS.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #10635
This commit is contained in:
Matthew Macy
2020-07-31 21:30:31 -07:00
committed by GitHub
parent 0cc3454821
commit 47ed79ff60
21 changed files with 79 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/os/freebsd/spl/sys/byteorder.h
+14
View File
@@ -84,9 +84,23 @@
#define htonll(x) BMASK_64(x)
#define ntohll(x) BMASK_64(x)
#else
#ifndef __LP64__
static __inline__ uint64_t
htonll(uint64_t n)
{
return ((((uint64_t)htonl(n)) << 32) + htonl(n >> 32));
}
static __inline__ uint64_t
ntohll(uint64_t n)
{
return ((((uint64_t)ntohl(n)) << 32) + ntohl(n >> 32));
}
#else
#define htonll(x) BSWAP_64(x)
#define ntohll(x) BSWAP_64(x)
#endif
#endif
#define BE_IN32(xa) htonl(*((uint32_t *)(void *)(xa)))
include/os/freebsd/spl/sys/ccompile.h
+6 -1
View File
@@ -202,11 +202,14 @@ typedef int enum_t;
#define ENODATA EINVAL
#define __XSI_VISIBLE 1000
#define __BSD_VISIBLE 1
#ifndef IN_BASE
#define __POSIX_VISIBLE 201808
#define __XSI_VISIBLE 1000
#endif
#define ARRAY_SIZE(a) (sizeof (a) / sizeof (a[0]))
#define open64 open
#define mmap64 mmap
#define pwrite64 pwrite
#define ftruncate64 ftruncate
#define lseek64 lseek
@@ -257,7 +260,9 @@ typedef int enum_t;
#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
#define RLIM64_INFINITY RLIM_INFINITY
#ifndef HAVE_ERESTART
#define ERESTART EAGAIN
#endif
#define ABS(a) ((a) < 0 ? -(a) : (a))
#endif
include/os/freebsd/spl/sys/kmem.h
+1 -1
View File
@@ -32,7 +32,7 @@
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/vmem.h>
#include <sys/vmmeter.h>
#include <sys/counter.h>
#include <vm/uma.h>
#include <vm/vm.h>
include/os/freebsd/spl/sys/simd_x86.h
+4
View File
@@ -29,7 +29,11 @@
#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/systm.h>
#ifdef __i386__
#include <x86/fpu.h>
#else
#include <machine/fpu.h>
#endif
#include <x86/x86_var.h>
#include <x86/specialreg.h>
include/os/freebsd/spl/sys/types.h
+1 -1
View File
@@ -73,7 +73,7 @@ typedef off_t off64_t;
typedef id_t taskid_t;
typedef id_t projid_t;
typedef id_t poolid_t;
typedef id_t zoneid_t;
typedef uint_t zoneid_t;
typedef id_t ctid_t;
typedef mode_t o_mode_t;
typedef uint64_t pgcnt_t;
include/os/freebsd/spl/sys/vnode.h
+7
View File
@@ -49,7 +49,9 @@ enum symfollow { NO_FOLLOW = NOFOLLOW };
#include <sys/proc.h>
#include <sys/vnode_impl.h>
#ifndef IN_BASE
#include_next <sys/vnode.h>
#endif
#include <sys/mount.h>
#include <sys/cred.h>
#include <sys/fcntl.h>
@@ -70,11 +72,14 @@ typedef struct vop_vector vnodeops_t;
#define rootvfs (rootvnode == NULL ? NULL : rootvnode->v_mount)
#ifndef IN_BASE
static __inline int
vn_is_readonly(vnode_t *vp)
{
return (vp->v_mount->mnt_flag & MNT_RDONLY);
}
#endif
#define vn_vfswlock(vp) (0)
#define vn_vfsunlock(vp) do { } while (0)
#define vn_ismntpt(vp) \
@@ -166,6 +171,7 @@ vn_is_readonly(vnode_t *vp)
#define AT_NOSET (AT_NLINK|AT_RDEV|AT_FSID|AT_NODEID|\
AT_BLKSIZE|AT_NBLOCKS|AT_SEQ)
#ifndef IN_BASE
static __inline void
vattr_init_mask(vattr_t *vap)
{
@@ -187,6 +193,7 @@ vattr_init_mask(vattr_t *vap)
if (vap->va_flags != VNOVAL)
vap->va_mask |= AT_XVATTR;
}
#endif
#define RLIM64_INFINITY 0