diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-03-29 10:07:34 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-03-29 10:07:34 +0000 |
| commit | da5137abdf463bb5fee85061958a14dd12bc043e (patch) | |
| tree | ffffad3f1648c73607c327cf262a2033075f4563 /sys/contrib/openzfs/include/sys/fs/zfs.h | |
| parent | ae6aa2d43daa6276dd18dc974a1c5b7c15264615 (diff) | |
| parent | bc3f12bfac152a0c28951cec92340ba14f9ccee9 (diff) | |
| download | src-da5137abdf463bb5fee85061958a14dd12bc043e.tar.gz src-da5137abdf463bb5fee85061958a14dd12bc043e.zip | |
zfs: merge openzfs/zfs@bc3f12bfa (master) into main
Notable upstream pull request merges:
#12083 libzfs: FreeBSD doesn't resize partitions for you
#13106 add physical device size to SIZE column in 'zpool list -v'
#13158 Allow zfs send to exclude datasets
#13190 module: zfs: zio_inject: zio_match_handler: don't << -1
#13219 FreeBSD: add missing replay check to an assert in zfs_xvattr_set
#13220 module: freebsd: avoid a taking a destroyed lock in zfs_zevent bits
#13221 Fix ACL checks for NFS kernel server
Obtained from: OpenZFS
OpenZFS commit: bc3f12bfac152a0c28951cec92340ba14f9ccee9
Diffstat (limited to 'sys/contrib/openzfs/include/sys/fs/zfs.h')
| -rw-r--r-- | sys/contrib/openzfs/include/sys/fs/zfs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/contrib/openzfs/include/sys/fs/zfs.h b/sys/contrib/openzfs/include/sys/fs/zfs.h index ab29b4e2ef38..f9fd5cf676e2 100644 --- a/sys/contrib/openzfs/include/sys/fs/zfs.h +++ b/sys/contrib/openzfs/include/sys/fs/zfs.h @@ -1185,6 +1185,7 @@ typedef struct vdev_stat { uint64_t vs_logical_ashift; /* vdev_logical_ashift */ uint64_t vs_physical_ashift; /* vdev_physical_ashift */ uint64_t vs_noalloc; /* allocations halted? */ + uint64_t vs_pspace; /* physical capacity */ } vdev_stat_t; #define VDEV_STAT_VALID(field, uint64_t_field_count) \ |