diff options
author | Matt Macy <mmacy@FreeBSD.org> | 2021-01-08 00:03:48 +0000 |
---|---|---|
committer | Matt Macy <mmacy@FreeBSD.org> | 2021-01-08 01:42:10 +0000 |
commit | b363d3d52a4977fa6e3856bb88fca1224e043234 (patch) | |
tree | 650079dab3c1683c198754aa4f24f5c55edd06bb /sys/contrib/openzfs/module | |
parent | 7877fdebeeb35fad1cbbafce22598b1bdf97c786 (diff) | |
download | src-b363d3d52a4977fa6e3856bb88fca1224e043234.tar.gz src-b363d3d52a4977fa6e3856bb88fca1224e043234.zip |
OpenZFS: Fix issues caused by reversed commits + rebase
Diffstat (limited to 'sys/contrib/openzfs/module')
-rw-r--r-- | sys/contrib/openzfs/module/os/freebsd/zfs/zfs_onexit_os.c | 0 | ||||
-rw-r--r-- | sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c (renamed from sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c) | 0 | ||||
-rw-r--r-- | sys/contrib/openzfs/module/os/linux/zfs/zfs_vnops_os.c (renamed from sys/contrib/openzfs/module/os/linux/zfs/zfs_vnops.c) | 0 | ||||
-rw-r--r-- | sys/contrib/openzfs/module/zfs/arc.c | 1 |
4 files changed, 0 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_onexit_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_onexit_os.c deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_onexit_os.c +++ /dev/null diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 2e8eadb5e16e..2e8eadb5e16e 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zfs_vnops.c b/sys/contrib/openzfs/module/os/linux/zfs/zfs_vnops_os.c index 3be387a30e5c..3be387a30e5c 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zfs_vnops.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zfs_vnops_os.c diff --git a/sys/contrib/openzfs/module/zfs/arc.c b/sys/contrib/openzfs/module/zfs/arc.c index c21ae27b9af8..e05b11d51942 100644 --- a/sys/contrib/openzfs/module/zfs/arc.c +++ b/sys/contrib/openzfs/module/zfs/arc.c @@ -4896,7 +4896,6 @@ arc_evict_cb_check(void *arg, zthr_t *zthr) * suffice. The arc_state_t structures can be queried * directly if more accurate information is needed. */ -#ifndef __FreeBSD__ if (arc_ksp != NULL) arc_ksp->ks_update(arc_ksp, KSTAT_READ); #endif |