diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-05-18 22:54:40 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-05-18 22:55:59 +0000 |
| commit | 716fd348e01c5f2ba125f878a634a753436c2994 (patch) | |
| tree | 0d738baf7a9ccfd90fa1e622f67e0399f306f024 /sys/contrib/openzfs/module/zfs/sa.c | |
| parent | 4e2d3f26bd12610ef8672eefb02814b882a4c29b (diff) | |
| parent | c0cf6ed6792e545fd614c2a88cb53756db7e03f8 (diff) | |
| download | src-716fd348e01c5f2ba125f878a634a753436c2994.tar.gz src-716fd348e01c5f2ba125f878a634a753436c2994.zip | |
zfs: merge openzfs/zfs@c0cf6ed67
Notable upstream pull request merges:
#10662 zvol_wait: Ignore locked zvols
#12789 Improve log spacemap load time
#12812 Improved zpool status output, list all affected datasets
#13277 FreeBSD: Use NDFREE_PNBUF if available
#13302 Make zfs_max_recordsize default to 16M
#13311 Fix error handling in FreeBSD's get/putpages VOPs
#13345 FreeBSD: Fix translation from ABD to physical pages
#13373 zfs: holds: dequadratify
#13375 Corrected edge case in uncompressed ARC->L2ARC handling
#13388 Improve mg_aliquot math
#13405 Reduce dbuf_find() lock contention
#13406 FreeBSD: use zero_region instead of allocating a dedicated page
Obtained from: OpenZFS
OpenZFS commit: c0cf6ed6792e545fd614c2a88cb53756db7e03f8
Diffstat (limited to 'sys/contrib/openzfs/module/zfs/sa.c')
| -rw-r--r-- | sys/contrib/openzfs/module/zfs/sa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/contrib/openzfs/module/zfs/sa.c b/sys/contrib/openzfs/module/zfs/sa.c index 2b6776581a47..db8c2b831f1d 100644 --- a/sys/contrib/openzfs/module/zfs/sa.c +++ b/sys/contrib/openzfs/module/zfs/sa.c @@ -1068,8 +1068,8 @@ sa_setup(objset_t *os, uint64_t sa_obj, const sa_attr_reg_t *reg_attrs, za.za_num_integers); break; } - VERIFY(ddi_strtoull(za.za_name, NULL, 10, - (unsigned long long *)&lot_num) == 0); + VERIFY0(ddi_strtoull(za.za_name, NULL, 10, + (unsigned long long *)&lot_num)); (void) sa_add_layout_entry(os, lot_attrs, za.za_num_integers, lot_num, |