diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-08-13 23:13:55 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-08-13 23:14:21 +0000 |
| commit | 271171e0d97b88ba2a7c3bf750c9672b484c1c13 (patch) | |
| tree | 762e9deff8e90e8eb4365124fb6a406ed8285a5a /sys/contrib/openzfs/module/nvpair | |
| parent | cc495d3b679d32324d8914adb10e293e7deae82b (diff) | |
| parent | b3d0568cfd65458c92f7ab3d7bb709087992628e (diff) | |
| download | src-271171e0d97b88ba2a7c3bf750c9672b484c1c13.tar.gz src-271171e0d97b88ba2a7c3bf750c9672b484c1c13.zip | |
zfs: merge openzfs/zfs@b3d0568cf
Notable upstream pull request merges:
#9372 Implement a new type of zfs receive: corrective receive (-c)
#13635 Add snapshots_changed as property
#13636 Add support for per dataset zil stats and use wmsum counters
#13643 Fix scrub resume from newly created hole
#13670 Fix memory allocation for the checksum benchmark
#13695 Skip checksum benchmarks on systems with slow cpu
#13711 zpool: fix redundancy check after vdev removal
Obtained from: OpenZFS
OpenZFS commit: b3d0568cfd65458c92f7ab3d7bb709087992628e
Diffstat (limited to 'sys/contrib/openzfs/module/nvpair')
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/contrib/openzfs/module/nvpair/fnvpair.c b/sys/contrib/openzfs/module/nvpair/fnvpair.c index 43c4b73590c4..86b0b4cdfc6e 100644 --- a/sys/contrib/openzfs/module/nvpair/fnvpair.c +++ b/sys/contrib/openzfs/module/nvpair/fnvpair.c @@ -6,7 +6,7 @@ * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. + * or https://opensource.org/licenses/CDDL-1.0. * See the License for the specific language governing permissions * and limitations under the License. * diff --git a/sys/contrib/openzfs/module/nvpair/nvpair.c b/sys/contrib/openzfs/module/nvpair/nvpair.c index a442990dade0..c8161f116b60 100644 --- a/sys/contrib/openzfs/module/nvpair/nvpair.c +++ b/sys/contrib/openzfs/module/nvpair/nvpair.c @@ -6,7 +6,7 @@ * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. + * or https://opensource.org/licenses/CDDL-1.0. * See the License for the specific language governing permissions * and limitations under the License. * diff --git a/sys/contrib/openzfs/module/nvpair/nvpair_alloc_fixed.c b/sys/contrib/openzfs/module/nvpair/nvpair_alloc_fixed.c index d7d3e7afd520..34adb86e0301 100644 --- a/sys/contrib/openzfs/module/nvpair/nvpair_alloc_fixed.c +++ b/sys/contrib/openzfs/module/nvpair/nvpair_alloc_fixed.c @@ -6,7 +6,7 @@ * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. + * or https://opensource.org/licenses/CDDL-1.0. * See the License for the specific language governing permissions * and limitations under the License. * diff --git a/sys/contrib/openzfs/module/nvpair/nvpair_alloc_spl.c b/sys/contrib/openzfs/module/nvpair/nvpair_alloc_spl.c index aa344b6423e8..4ecb029961f5 100644 --- a/sys/contrib/openzfs/module/nvpair/nvpair_alloc_spl.c +++ b/sys/contrib/openzfs/module/nvpair/nvpair_alloc_spl.c @@ -7,7 +7,7 @@ * with the License. * * You can obtain a copy of the license at * usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. + * or https://opensource.org/licenses/CDDL-1.0. * See the License for the specific language governing permissions * and limitations under the License. * |