diff options
| author | Matthew Macy <[email protected]> | 2020-07-01 09:10:08 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-01 09:10:08 -0700 |
| commit | 7ddb753d17f2c12f152647c0e34eb9c42ee5e4af (patch) | |
| tree | ab796d8c21e0317bf2c8ba7d2f75eb9c903103ce /module/zfs | |
| parent | 22831636c8c132c62c771c64e7131b422e41be34 (diff) | |
freebsd: changes necessary to coexist with dtrace in tree
Fix header conflicts when building zfs with openzfs as a vendor import.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes #10497
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/spa_config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/module/zfs/spa_config.c b/module/zfs/spa_config.c index 3a65b0bb4..b30c65e71 100644 --- a/module/zfs/spa_config.c +++ b/module/zfs/spa_config.c @@ -27,6 +27,7 @@ */ #include <sys/spa.h> +#include <sys/file.h> #include <sys/fm/fs/zfs.h> #include <sys/spa_impl.h> #include <sys/nvpair.h> |