Commit graph

4 commits

Author SHA1 Message Date
Martin Matuska
f7f5c2419e zfs: merge openzfs/zfs@55dd24c4c (zfs-2.2-release) into stable/14
OpenZFS release 2.2.1

Notable upstream pull request merges:

 #14378 6d693e20a Large sync writes perform worse with slog
 #15243 78fd79eac Add zfs_prepare_disk script for disk firmware install
 #15356 b76724ae4 FreeBSD: Improve taskq wrapper
 #15360 f9a9aea12 Add mutex_enter_interruptible() for interruptible
                  sleeping IOCTLs
 #15371 e82e68400 DMU: Do not pre-read holes during write
 #15390 79f7de575 Remove lock from dsl_pool_need_dirty_delay()
 #15397 6e41aca51 Trust ARC_BUF_SHARED() more
 #15402 eaa62d995 Properly pad struct tx_cpu to cache line
 #15405 1cc1bf4fa Set spa_ccw_fail_time=0 when expanding a vdev
 #15416 edebca5df FreeBSD: taskq: Remove unused declaration
 #15451 7aef672b7 Read prefetched buffers from L2ARC
 #15452 bd7a02c25 Tune zio buffer caches and their alignments
 #15456 3ec4ea68d Unify arc_prune_async() code
 #15465 459c99ff2 Fix block cloning between unencrypted and encrypted
                  datasets
 #15478 76663fe37 Fix accounting error for pending sync IO ops in zpool
                  iostat
 #15529 87e9e8286 Add a tunable to disable BRT support

Obtained from:	OpenZFS
OpenZFS commit:	55dd24c4cc
OpenZFS tag:	zfs-2.2.1
2023-11-22 12:43:59 +01:00
Warner Losh
d0b2dbfa0e Remove $FreeBSD$: one-line sh pattern
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
2023-08-16 11:55:03 -06:00
Brooks Davis
3bf6636512 cddl/*: add a WITH(OUT)_DTRACE option
Add an option to enable/disable DTrace without disabling ZFS.  New
architectures such as CHERI may support ZFS before they support DTrace
and the old model of WITHOUT_CDDL disabling both wasn't helpful.

For compatiblity, the CDDL option remains and WITHOUT_CDDL implies
WITHOUT_DTRACE.  WITHOUT_DTRACE also implies WITHOUT_CTF.

As part of this change, largely convert cddl/*/Makefile to using the
more compact SUBDIR.${MK_<FOO>}+= form rather than using intermediate
variables.

Reviewed by:	markj
Obtained from:	CheriBSD
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D35718
2022-07-06 14:03:48 +01:00
Martin Matuska
48b4fe0503 zfs: attach zpool_influxdb to build
From the zpool_influxdb.8 manual page:
  zpool_influxdb produces InfluxDB-line-protocol-compatible metrics from
  zpools.  Like the zpool command, zpool_influxdb reads the current pool
  status and statistics.  Unlike the zpool command which is intended for
  humans, zpool_influxdb formats the output in the InfluxDB line protocol.
  The expected use is as a plugin to a metrics collector or aggregator,
  such as Telegraf.

zpool_influxdb is installed into /usr/libexec/zfs/

Differential revision:	https://reviews.freebsd.org/D31094
MFC after:	3 days
2021-07-07 20:15:12 +02:00