diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-10-30 20:28:03 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-10-30 20:42:11 +0000 |
| commit | 6c1e79df8c651b31ca4f656336e6c5ac29a66482 (patch) | |
| tree | 751fa1ffefeabc6e248d538b8883cff639b40285 /sys/contrib/openzfs/include/sys/fs/zfs.h | |
| parent | 87c5032353106764f324e82541662f448e68f38a (diff) | |
| parent | 043c6ee3b6bfb55f8d36e1f048ff13128c279fb8 (diff) | |
| download | src-6c1e79df8c651b31ca4f656336e6c5ac29a66482.tar.gz src-6c1e79df8c651b31ca4f656336e6c5ac29a66482.zip | |
zfs: merge openzfs/zfs@043c6ee3b
Notable upstream pull request merges:
#15360 97a0b5be Add mutex_enter_interruptible() for interruptible sleeping
IOCTLs
#15381 252f46be ZIL: Detect single-threaded workloads
#15398 3afdc97d ZIO: Remove READY pipeline stage from root ZIOs
#15428 e007908a ABD: Be more assertive in iterators
#15436 07345ac2 Add prefetch property
#15438 e9725abd Revert "Do not persist user/group/project quota zap objects
when unneeded"
#15451 043c6ee3 Read prefetched buffers from L2ARC
Obtained from: OpenZFS
OpenZFS commit: 043c6ee3b6bfb55f8d36e1f048ff13128c279fb8
Diffstat (limited to 'sys/contrib/openzfs/include/sys/fs/zfs.h')
| -rw-r--r-- | sys/contrib/openzfs/include/sys/fs/zfs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sys/contrib/openzfs/include/sys/fs/zfs.h b/sys/contrib/openzfs/include/sys/fs/zfs.h index bc940e8a7929..9d7eca9784b6 100644 --- a/sys/contrib/openzfs/include/sys/fs/zfs.h +++ b/sys/contrib/openzfs/include/sys/fs/zfs.h @@ -191,6 +191,7 @@ typedef enum { ZFS_PROP_REDACTED, ZFS_PROP_REDACT_SNAPS, ZFS_PROP_SNAPSHOTS_CHANGED, + ZFS_PROP_PREFETCH, ZFS_NUM_PROPS } zfs_prop_t; @@ -543,6 +544,12 @@ typedef enum zfs_key_location { ZFS_KEYLOCATION_LOCATIONS } zfs_keylocation_t; +typedef enum { + ZFS_PREFETCH_NONE = 0, + ZFS_PREFETCH_METADATA = 1, + ZFS_PREFETCH_ALL = 2 +} zfs_prefetch_type_t; + #define DEFAULT_PBKDF2_ITERATIONS 350000 #define MIN_PBKDF2_ITERATIONS 100000 |