From 57b9b81894e89f8fc686246618b3ac422a756641 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Mon, 22 Feb 2021 12:35:56 +0100 Subject: zfs: merge OpenZFS master-9312e0fd1 Notable upstream changes: 778869fa1 Fix reporting of mount progress e7adccf7f Disable use of hardware crypto offload drivers on FreeBSD 03e02e5b5 Fix checksum errors not being counted on repeated repair 64e0fe14f Restore FreeBSD resource usage accounting 11f2e9a49 Fix panic if scrubbing after removing a slog device (cherry picked from commit ba27dd8be821792e15bdabfac69fd6cab0cf9dd3) --- cddl/lib/libzpool/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cddl') diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 819f67ceec5a..6893e31ff20a 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -160,9 +160,9 @@ KERNEL_C = \ zfs_debug.c \ zfs_fm.c \ zfs_fuid.c \ - zfs_racct.c \ zfs_sa.c \ zfs_znode.c \ + zfs_racct.c \ zfs_ratelimit.c \ zfs_rlock.c \ zil.c \ -- cgit v1.2.3