c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-24 11:18:52 +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/file.h
+2
View File
@@ -29,6 +29,8 @@
#ifndef _OPENSOLARIS_SYS_FILE_H_
#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 */