diff options
| author | Matt Macy <mmacy@FreeBSD.org> | 2021-01-07 23:27:17 +0000 |
|---|---|---|
| committer | Matt Macy <mmacy@FreeBSD.org> | 2021-01-08 00:55:59 +0000 |
| commit | 7877fdebeeb35fad1cbbafce22598b1bdf97c786 (patch) | |
| tree | 10ccc0bab059d6f48a221045b92416fc347fe784 /sys/contrib/openzfs/include/os/freebsd/zfs/sys | |
| parent | 84089de83e79a0f748c6e22b1aacb59156e153d2 (diff) | |
| download | src-7877fdebeeb35fad1cbbafce22598b1bdf97c786.tar.gz src-7877fdebeeb35fad1cbbafce22598b1bdf97c786.zip | |
OpenZFS merge main-gf11b09
- add dRAID support
- fix duplicate close handling
- fix memory leak in prefetch
- fix problem with SIMD benchmarking on FreeBSD boot
...
Diffstat (limited to 'sys/contrib/openzfs/include/os/freebsd/zfs/sys')
4 files changed, 9 insertions, 6 deletions
diff --git a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/Makefile.am b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/Makefile.am index bf5cc39eba74..392bb4ae3477 100644 --- a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/Makefile.am +++ b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/Makefile.am @@ -8,7 +8,7 @@ KERNEL_H = \ zfs_dir.h \ zfs_ioctl_compat.h \ zfs_vfsops_os.h \ - zfs_vnops.h \ + zfs_vnops_os.h \ zfs_znode_impl.h \ zpl.h diff --git a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_context_os.h b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_context_os.h index 0316f93b27ec..8dbe907d098c 100644 --- a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_context_os.h +++ b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_context_os.h @@ -56,7 +56,6 @@ #define tsd_set(key, value) osd_thread_set(curthread, (key), (value)) #define fm_panic panic -#define cond_resched() kern_yield(PRI_USER) extern int zfs_debug_level; extern struct mtx zfs_debug_mtx; #define ZFS_LOG(lvl, ...) do { \ diff --git a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops.h b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops.h index 587650af6ce3..bf5e03b24c06 100644 --- a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops.h +++ b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops.h @@ -26,8 +26,9 @@ * $FreeBSD$ */ -#ifndef _SYS_ZFS_VNOPS_H_ -#define _SYS_ZFS_VNOPS_H_ +#ifndef _SYS_FS_ZFS_VNOPS_OS_H +#define _SYS_FS_ZFS_VNOPS_OS_H + int dmu_write_pages(objset_t *os, uint64_t object, uint64_t offset, uint64_t size, struct vm_page **ppa, dmu_tx_t *tx); int dmu_read_pages(objset_t *os, uint64_t object, vm_page_t *ma, int count, diff --git a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_znode_impl.h b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_znode_impl.h index ff61935e741e..ac2625d9a8ab 100644 --- a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_znode_impl.h +++ b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_znode_impl.h @@ -39,6 +39,7 @@ #include <sys/zfs_acl.h> #include <sys/zil.h> #include <sys/zfs_project.h> +#include <vm/vm_object.h> #ifdef __cplusplus extern "C" { @@ -113,7 +114,10 @@ extern minor_t zfsdev_minor_alloc(void); #define Z_ISBLK(type) ((type) == VBLK) #define Z_ISCHR(type) ((type) == VCHR) #define Z_ISLNK(type) ((type) == VLNK) +#define Z_ISDIR(type) ((type) == VDIR) +#define zn_has_cached_data(zp) vn_has_cached_data(ZTOV(zp)) +#define zn_rlimit_fsize(zp, uio, td) vn_rlimit_fsize(ZTOV(zp), (uio), (td)) /* Called on entry to each ZFS vnode and vfs operation */ #define ZFS_ENTER(zfsvfs) \ @@ -169,13 +173,12 @@ extern void zfs_tstamp_update_setup_ext(struct znode *, uint_t, uint64_t [2], uint64_t [2], boolean_t have_tx); extern void zfs_znode_free(struct znode *); -extern zil_get_data_t zfs_get_data; extern zil_replay_func_t *zfs_replay_vector[TX_MAX_TYPE]; extern int zfsfstype; extern int zfs_znode_parent_and_name(struct znode *zp, struct znode **dzpp, char *buf); - +extern void zfs_inode_update(struct znode *); #ifdef __cplusplus } #endif |