diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-02-15 09:21:13 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-02-15 09:22:15 +0000 |
| commit | e2257b3168fc1697518265527e5d817eca6c43b8 (patch) | |
| tree | 2cb028ed04bdb43ecf67f4068b37d7dbf075e7d0 /sys/contrib/openzfs/include/sys/fs/zfs.h | |
| parent | 3733d82c4deb49035a39e18744085d1e3e9b8dc5 (diff) | |
| parent | e0bd8118d04b55b7adf3d9ba256ad4bb53e66512 (diff) | |
| download | src-e2257b3168fc1697518265527e5d817eca6c43b8.tar.gz src-e2257b3168fc1697518265527e5d817eca6c43b8.zip | |
zfs: merge openzfs/zfs@e0bd8118d
Notable upstream pull request merges:
#15469 cbe882298 Add slow disk diagnosis to ZED
#15857 d0d273320 Update zfs-snapshot.8
#15864 a5a725440 zfs list: add '-t fs' and '-t vol' options
#15874 6cc93ccde BRT: Fix slop space calculation with block cloning
#15882 a0635ae73 zdb: Fix false leak report for BRT objects
Obtained from: OpenZFS
OpenZFS commit: e0bd8118d04b55b7adf3d9ba256ad4bb53e66512
Diffstat (limited to 'sys/contrib/openzfs/include/sys/fs/zfs.h')
| -rw-r--r-- | sys/contrib/openzfs/include/sys/fs/zfs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/contrib/openzfs/include/sys/fs/zfs.h b/sys/contrib/openzfs/include/sys/fs/zfs.h index c6f7dcca78b3..025567e2183f 100644 --- a/sys/contrib/openzfs/include/sys/fs/zfs.h +++ b/sys/contrib/openzfs/include/sys/fs/zfs.h @@ -366,6 +366,8 @@ typedef enum { VDEV_PROP_IO_N, VDEV_PROP_IO_T, VDEV_PROP_RAIDZ_EXPANDING, + VDEV_PROP_SLOW_IO_N, + VDEV_PROP_SLOW_IO_T, VDEV_NUM_PROPS } vdev_prop_t; |