From 2533571dbf0b46d98020d81c82b2f01fc8b87542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= Date: Sun, 1 Dec 2019 01:34:28 +0100 Subject: [PATCH] Formal changes: tests, documentation, copyright MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add zstd to the test suite - add zstd to history_002_pos.ksh - add random levels of zstd to history_002_pos.ksh - add zstd-fast to history_002_pos.ksh - add random levels of zstd-fast to history_002_pos.ksh Add documentation - add man page content - add README for contrib/zstd Fixup copyright headers of touched and new files - Adds copyright headers for Allan Jude / Klara Inc. - Added Ornias1993 Copyright - Cleans copyright header formatting Signed-off-by: Allan Jude Signed-off-by: Sebastian Gottschall Signed-off-by: Kjeld Schouten-Lebbing Signed-off-by: Michael Niewöhner --- contrib/zstd/README.md | 20 ++++++ include/sys/arc.h | 8 ++- include/sys/spa.h | 20 +++--- include/sys/zio.h | 11 ++-- include/sys/zio_compress.h | 6 +- man/man5/zpool-features.5 | 40 +++++++++++- man/man8/zfsprops.8 | 65 ++++++++++++++----- module/zcommon/zfeature_common.c | 13 ++-- module/zcommon/zfs_prop.c | 13 ++-- module/zfs/arc.c | 11 ++-- module/zfs/dbuf.c | 12 ++-- module/zfs/dmu.c | 12 ++-- module/zfs/dmu_objset.c | 22 ++++--- module/zfs/dmu_recv.c | 14 ++-- module/zfs/dmu_send.c | 16 +++-- module/zfs/dsl_dataset.c | 17 +++-- module/zfs/zcp_get.c | 5 +- module/zfs/zfs_ioctl.c | 32 ++++----- module/zfs/zio.c | 10 ++- module/zfs/zio_compress.c | 13 ++-- tests/zfs-tests/include/properties.shlib | 2 +- .../cli_root/zpool_get/zpool_get.cfg | 1 + .../functional/history/history_002_pos.ksh | 4 +- 23 files changed, 249 insertions(+), 118 deletions(-) create mode 100644 contrib/zstd/README.md diff --git a/contrib/zstd/README.md b/contrib/zstd/README.md new file mode 100644 index 000000000000..927b17e11230 --- /dev/null +++ b/contrib/zstd/README.md @@ -0,0 +1,20 @@ + +# ZSTD Contrib Library Manual + + +## Introduction + +ZSTD on ZFS uses a heavily cut down, but otherwise unmodified version of ZSTD. +This `contrib` contains the unmodified ZSTD library, please do not edit these files. + +## Updating ZSTD + +To update ZSTD the following steps need to be taken: + +1. Download the latest archive of ZSTD +2. Replace (not merge): `common`, `compress`, `decompress` and `zstd.h` with the new version from the `lib` folder in the downloaded archive of zstd. +3. Make sure any newly requered files and/or folders are also included. + A. Make sure new folders are listed in: `configure.ac` + B. Make sure new Files And Folder are listed in: `lib/libzstd/Makefile.am` and `module/zstd/Makefile.in` + C. Make sure any relevant File and Folders are listed in this Readme +4. Make sure to change `ZFS_MODULE_VERSION("1.4.4")` in `module/zstd/zstd.c` \ No newline at end of file diff --git a/include/sys/arc.h b/include/sys/arc.h index 79284167aba1..522d6336bdaa 100644 --- a/include/sys/arc.h +++ b/include/sys/arc.h @@ -18,10 +18,14 @@ * * CDDL HEADER END */ + /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2016 by Delphix. All rights reserved. - * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. + * Copyright (c) 2012, 2016, Delphix. All rights reserved. + * Copyright (c) 2013, Saso Kiselkov. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Use is subject to license terms. */ #ifndef _SYS_ARC_H diff --git a/include/sys/spa.h b/include/sys/spa.h index 675290bff279..18ae9fb28411 100644 --- a/include/sys/spa.h +++ b/include/sys/spa.h @@ -18,16 +18,20 @@ * * CDDL HEADER END */ + /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011, 2019 by Delphix. All rights reserved. - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. - * Copyright 2013 Saso Kiselkov. All rights reserved. - * Copyright (c) 2014 Integros [integros.com] - * Copyright 2017 Joyent, Inc. - * Copyright (c) 2017, 2019, Datto Inc. All rights reserved. - * Copyright (c) 2017, Intel Corporation. + * Copyright (c) 2011, 2019, Delphix. All rights reserved. + * Copyright (c) 2011, Nexenta Systems Inc. All rights reserved. + * Copyright (c) 2014, Spectra Logic Corporation. All rights reserved. + * Copyright (c) 2013, Saso Kiselkov. All rights reserved. + * Copyright (c) 2014, Integros. All rights reserved. + * Copyright (c) 2017, Joyent, Inc. All rights reserved. + * Copyright (c) 2017, Datto Inc. All rights reserved. + * Copyright (c) 2017, Intel Corporation. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Use is subject to license terms. */ #ifndef _SYS_SPA_H diff --git a/include/sys/zio.h b/include/sys/zio.h index 0e5b956450e2..91775b6f5f87 100644 --- a/include/sys/zio.h +++ b/include/sys/zio.h @@ -21,11 +21,14 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012, 2018 by Delphix. All rights reserved. - * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. + * Copyright (c) 2011, Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2012, 2018, Delphix. All rights reserved. + * Copyright (c) 2013, Saso Kiselkov. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. - * Copyright 2016 Toomas Soome + * Copyright (c) 2016, Toomas Soome. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Use is subject to license terms. */ #ifndef _ZIO_H diff --git a/include/sys/zio_compress.h b/include/sys/zio_compress.h index 3b4340f21eee..cfb20e2fbac0 100644 --- a/include/sys/zio_compress.h +++ b/include/sys/zio_compress.h @@ -20,9 +20,11 @@ */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2009, Sun Microsystems Inc. All rights reserved. + * Copyright (c) 2015, 2016, Delphix. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. * Use is subject to license terms. - * Copyright (c) 2015, 2016 by Delphix. All rights reserved. */ #ifndef _SYS_ZIO_COMPRESS_H diff --git a/man/man5/zpool-features.5 b/man/man5/zpool-features.5 index b9a739d5bb22..de13a6a99820 100644 --- a/man/man5/zpool-features.5 +++ b/man/man5/zpool-features.5 @@ -1,7 +1,4 @@ '\" te -.\" Copyright (c) 2012, 2018 by Delphix. All rights reserved. -.\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved. -.\" Copyright (c) 2014, Joyent, Inc. All rights reserved. .\" The contents of this file are subject to the terms of the Common Development .\" and Distribution License (the "License"). You may not use this file except .\" in compliance with the License. You can obtain a copy of the license at @@ -14,6 +11,11 @@ .\" CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your .\" own identifying information: .\" Portions Copyright [yyyy] [name of copyright owner] +.\" Copyright (c) 2012, 2018, Delphix. All rights reserved. +.\" Copyright (c) 2013, Saso Kiselkov. All rights reserved. +.\" Copyright (c) 2014, Joyent Inc. All rights reserved. +.\" Copyright (c) 2019, Klara Inc. All rights reserved. +.\" Copyright (c) 2019, Allan Jude. All rights reserved. .TH ZPOOL-FEATURES 5 "Jun 8, 2018" .SH NAME zpool\-features \- ZFS pool feature descriptions @@ -927,5 +929,37 @@ is used to checkpoint the pool. The feature will only return back to being \fBenabled\fR when the pool is rewound or the checkpoint has been discarded. +.sp +.ne 2 +.na +\fBzstd_compress\fR +.ad +.RS 4n +.TS +l l . +GUID org.freebsd:zstd_compress +READ\-ONLY COMPATIBLE no +DEPENDENCIES none +.TE + +\fBzstd\fR is a high-performance compression algorithm that features a +combination of high compression ratios and high speed. +Compared to \fBgzip\fR, \fBzstd\fR offers slighty better compression at much +higher speeds. +Compared to \fBlz4\fR, \fBzstd\fR offers much better compression while being +only modestly slower. +Typically, \fBzstd\fR compression speed ranges from 250 - 500 +megabytes/second/thread, and decompression speed is over 1 +gigabyte/second/thread. +Booting off of \fBzstd\fR-compressed root pools is not yet supported. + +When the \fBzstd\fR feature is set to \fBenabled\fR, the administrator can turn +on \fBzstd\fR compression of any dataset by running +`zfs set compress=zstd `. +This feature becomes \fBactive\fR once a \fBcompress\fR property has been set to +\fBzstd\fR, and will return to being \fBenabled\fR once all filesystems that +have ever had their compress property set to \fBzstd\fR are destroyed. +.RE + .SH "SEE ALSO" zpool(8) diff --git a/man/man8/zfsprops.8 b/man/man8/zfsprops.8 index da3280a9f0dc..890a802683e8 100644 --- a/man/man8/zfsprops.8 +++ b/man/man8/zfsprops.8 @@ -19,23 +19,22 @@ .\" CDDL HEADER END .\" .\" -.\" Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved. -.\" Copyright 2011 Joshua M. Clulow -.\" Copyright (c) 2011, 2019 by Delphix. All rights reserved. -.\" Copyright (c) 2011, Pawel Jakub Dawidek -.\" Copyright (c) 2012, Glen Barber -.\" Copyright (c) 2012, Bryan Drewery -.\" Copyright (c) 2013, Steven Hartland -.\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved. -.\" Copyright (c) 2014, Joyent, Inc. All rights reserved. -.\" Copyright (c) 2014 by Adam Stevko. All rights reserved. -.\" Copyright (c) 2014 Integros [integros.com] -.\" Copyright (c) 2016 Nexenta Systems, Inc. All Rights Reserved. -.\" Copyright (c) 2014, Xin LI -.\" Copyright (c) 2014-2015, The FreeBSD Foundation, All Rights Reserved. -.\" Copyright 2019 Richard Laager. All rights reserved. -.\" Copyright 2018 Nexenta Systems, Inc. -.\" Copyright 2019 Joyent, Inc. +.\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved. +.\" Copyright (c) 2011, Joshua M. Clulow. All Rights Reserved. +.\" Copyright (c) 2011, 2019, Delphix. All rights reserved. +.\" Copyright (c) 2011, Pawel Jakub Dawidek. All rights reserved. +.\" Copyright (c) 2012, Glen Barber. All rights reserved. +.\" Copyright (c) 2012, Bryan Drewery. All rights reserved. +.\" Copyright (c) 2013, Steven Hartland. All rights reserved. +.\" Copyright (c) 2013, Saso Kiselkov. All rights reserved. +.\" Copyright (c) 2014, 2019, Joyent, Inc. All rights reserved. +.\" Copyright (c) 2014, Adam Stevko. All rights reserved. +.\" Copyright (c) 2014, Integros. All rights reserved. +.\" Copyright (c) 2014, Xin LI. All rights reserved. +.\" Copyright (c) 2014-2015, The FreeBSD Foundation. All Rights Reserved. +.\" Copyright (c) 2016, 2018, Nexenta Systems, Inc. All rights reserved. +.\" Copyright (c) 2019, Richard Laager. All rights reserved. +.\" Copyright (c) 2019, Kjeld Schouten-Lebbing. All rights reserved. .\" .Dd June 30, 2019 .Dt ZFSPROPS 8 @@ -723,7 +722,8 @@ for more information on these algorithms. Changing this property affects only newly-written data. .It Xo .Sy compression Ns = Ns Sy on Ns | Ns Sy off Ns | Ns Sy gzip Ns | Ns -.Sy gzip- Ns Em N Ns | Ns Sy lz4 Ns | Ns Sy lzjb Ns | Ns Sy zle +.Sy gzip- Ns Em N Ns | Ns Sy lz4 Ns | Ns Sy lzjb Ns | Ns Sy zle Ns | Ns Sy zstd Ns | Ns +.Sy zstd- Ns Em N Ns | Ns Sy zstd-fast- Ns Em N .Xc Controls the compression algorithm used for this dataset. .Pp @@ -791,6 +791,35 @@ is equivalent to .Pc . .Pp The +.Sy zstd +compression using the zstd algorithm , +You can specify the +.Sy zstd +level by using the value +.Sy zstd- Ns Em N , +where +.Em N +is an integer from 1 +.Pq fastest +to 19 +.Pq best compression ratio . +.Sy zstd +You can also specify a negative +.Sy zstd +level by using the value +.Sy zstd- Ns Em N , +where +.Em N +is an integer from 100 +.Pq fastest +to 1 +.Pq best compression ratio . +.Sy zstd +is equivalent to +.Sy zstd-3 +.Pc . +.Pp +The .Sy zle compression algorithm compresses runs of zeros. .Pp diff --git a/module/zcommon/zfeature_common.c b/module/zcommon/zfeature_common.c index 02aaf8a0f762..1863b8e55d3c 100644 --- a/module/zcommon/zfeature_common.c +++ b/module/zcommon/zfeature_common.c @@ -20,11 +20,14 @@ */ /* - * Copyright (c) 2011, 2018 by Delphix. All rights reserved. - * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. - * Copyright (c) 2013, Joyent, Inc. All rights reserved. - * Copyright (c) 2014, Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2017, Intel Corporation. + * Copyright (c) 2011, 2018, Delphix. All rights reserved. + * Copyright (c) 2013, Saso Kiselkov. All rights reserved. + * Copyright (c) 2013, Joyent Inc. All rights reserved. + * Copyright (c) 2014, Nexenta Systems Inc. All rights reserved. + * Copyright (c) 2017, Intel Corporation. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Use is subject to license terms. */ #ifndef _KERNEL diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c index 59e4e3a3e330..c4109ee06dae 100644 --- a/module/zcommon/zfs_prop.c +++ b/module/zcommon/zfs_prop.c @@ -18,16 +18,17 @@ * * CDDL HEADER END */ + /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011, 2018 by Delphix. All rights reserved. - * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. - * Copyright 2016, Joyent, Inc. - * Portions Copyright (c) 2019 by Klara Inc. + * Copyright (c) 2010, Robert Milkowski. All rights reserved. + * Copyright (c) 2011, 2018, Delphix. All rights reserved. + * Copyright (c) 2013, Saso Kiselkov. All rights reserved. + * Copyright (c) 2016, Joyent, Inc. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Use is subject to license terms. */ -/* Portions Copyright 2010 Robert Milkowski */ - #include #include #include diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 97bd19d05129..9ab1b30b1faa 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -18,14 +18,15 @@ * * CDDL HEADER END */ + /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2018, Joyent, Inc. - * Copyright (c) 2011, 2019 by Delphix. All rights reserved. - * Copyright (c) 2014 by Saso Kiselkov. All rights reserved. - * Copyright 2017 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2018, Joyent Inc. All rights reserved. + * Copyright (c) 2011, 2019, Delphix. All rights reserved. + * Copyright (c) 2014, Saso Kiselkov. All rights reserved. + * Copyright (c) 2017, Nexenta Systems Inc. All rights reserved. * Copyright (c) 2019, loli10K . All rights reserved. - * Portions Copyright (c) 2019 by Klara Inc. + * Copyright (c) 2019, Klara Inc. All rights reserved. */ /* diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c index b9f71141cddd..210f9684032c 100644 --- a/module/zfs/dbuf.c +++ b/module/zfs/dbuf.c @@ -18,12 +18,16 @@ * * CDDL HEADER END */ + /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012, 2019 by Delphix. All rights reserved. - * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. - * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. + * Copyright (c) 2011, Nexenta Systems Inc. All rights reserved. + * Copyright (c) 2012, 2019, Delphix. All rights reserved. + * Copyright (c) 2013, Saso Kiselkov. All rights reserved. + * Copyright (c) 2014, Spectra Logic Corporation. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Use is subject to license terms. */ #include diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c index d99aed1991f8..4708d425eff9 100644 --- a/module/zfs/dmu.c +++ b/module/zfs/dmu.c @@ -18,14 +18,18 @@ * * CDDL HEADER END */ + /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011, 2018 by Delphix. All rights reserved. - * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. + * Copyright (c) 2011, 2018, Delphix. All rights reserved. + * Copyright (c) 2013, Saso Kiselkov. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. * Copyright (c) 2016, Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2015 by Chunwei Chen. All rights reserved. - * Copyright (c) 2019 Datto Inc. + * Copyright (c) 2015, Chunwei Chen. All rights reserved. + * Copyright (c) 2019, Datto Inc. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Use is subject to license terms. */ #include diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c index 4966f8da5663..1984cfe42f58 100644 --- a/module/zfs/dmu_objset.c +++ b/module/zfs/dmu_objset.c @@ -21,19 +21,21 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2018 by Delphix. All rights reserved. - * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. - * Copyright (c) 2013, Joyent, Inc. All rights reserved. - * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. - * Copyright (c) 2015, STRATO AG, Inc. All rights reserved. - * Copyright (c) 2016 Actifio, Inc. All rights reserved. - * Copyright 2017 Nexenta Systems, Inc. - * Copyright (c) 2017 Open-E, Inc. All Rights Reserved. + * Copyright (c) 2010, Robert Milkowski. All rights reserved. + * Copyright (c) 2012, 2018, Delphix. All rights reserved. + * Copyright (c) 2013, Saso Kiselkov. All rights reserved. + * Copyright (c) 2013, Joyent Inc. All rights reserved. + * Copyright (c) 2014, Spectra Logic Corporation. All rights reserved. + * Copyright (c) 2015, STRATO AG. All rights reserved. + * Copyright (c) 2016, Actifio Inc. All rights reserved. + * Copyright (c) 2017, Nexenta Systems Inc. All Rights Reserved. + * Copyright (c) 2017, Open-E Inc. All Rights Reserved. * Copyright (c) 2018, loli10K . All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Use is subject to license terms. */ -/* Portions Copyright 2010 Robert Milkowski */ - #include #include #include diff --git a/module/zfs/dmu_recv.c b/module/zfs/dmu_recv.c index 0130e4202379..3480fcbb3aff 100644 --- a/module/zfs/dmu_recv.c +++ b/module/zfs/dmu_recv.c @@ -18,13 +18,17 @@ * * CDDL HEADER END */ + /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2011, 2018 by Delphix. All rights reserved. - * Copyright (c) 2014, Joyent, Inc. All rights reserved. - * Copyright 2014 HybridCluster. All rights reserved. - * Copyright (c) 2018, loli10K . All rights reserved. + * Copyright (c) 2011, Nexenta Systems Inc. All rights reserved. + * Copyright (c) 2011, 2018 Delphix. All rights reserved. + * Copyright (c) 2014, Joyent Inc. All rights reserved. + * Copyright (c) 2014, HybridCluster. All rights reserved. + * Copyright (c) 2018, loli10K. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Use is subject to license terms. */ #include diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c index ee37a5c8955a..eb312c867569 100644 --- a/module/zfs/dmu_send.c +++ b/module/zfs/dmu_send.c @@ -18,14 +18,18 @@ * * CDDL HEADER END */ + /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2011, 2018 by Delphix. All rights reserved. - * Copyright (c) 2014, Joyent, Inc. All rights reserved. - * Copyright 2014 HybridCluster. All rights reserved. - * Copyright 2016 RackTop Systems. - * Copyright (c) 2016 Actifio, Inc. All rights reserved. + * Copyright (c) 2011, Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2011, 2018, Delphix. All rights reserved. + * Copyright (c) 2014, Joyent Inc. All rights reserved. + * Copyright (c) 2014, HybridCluster. All rights reserved. + * Copyright (c) 2016, RackTop Systems. All rights reserved. + * Copyright (c) 2016, Actifio Inc. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Use is subject to license terms. */ #include diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c index 6a27666acf56..6f575cee4c9d 100644 --- a/module/zfs/dsl_dataset.c +++ b/module/zfs/dsl_dataset.c @@ -21,13 +21,16 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011, 2018 by Delphix. All rights reserved. - * Copyright (c) 2014, Joyent, Inc. All rights reserved. - * Copyright (c) 2014 RackTop Systems. - * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. - * Copyright (c) 2016 Actifio, Inc. All rights reserved. - * Copyright 2016, OmniTI Computer Consulting, Inc. All rights reserved. - * Copyright 2017 Nexenta Systems, Inc. + * Copyright (c) 2011, 2018, Delphix. All rights reserved. + * Copyright (c) 2014, Joyent Inc. All rights reserved. + * Copyright (c) 2014, RackTop Systems. All rights reserved. + * Copyright (c) 2014, Spectra Logic Corporation. All rights reserved. + * Copyright (c) 2016, Actifio Inc. All rights reserved. + * Copyright (c) 2016, OmniTI Computer Consulting Inc. All rights reserved. + * Copyright (c) 2017, Nexenta Systems Inc. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Use is subject to license terms. */ #include diff --git a/module/zfs/zcp_get.c b/module/zfs/zcp_get.c index b6e804553441..9095d014fe38 100644 --- a/module/zfs/zcp_get.c +++ b/module/zfs/zcp_get.c @@ -14,7 +14,10 @@ */ /* - * Copyright (c) 2016 by Delphix. All rights reserved. + * Copyright (c) 2016, Delphix. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Use is subject to license terms. */ #include diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 213c7e4042ff..9938abd7e26d 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -21,22 +21,24 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Portions Copyright 2011 Martin Matuska - * Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved. - * Portions Copyright 2012 Pawel Jakub Dawidek - * Copyright (c) 2014, 2016 Joyent, Inc. All rights reserved. - * Copyright 2016 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2014, Joyent, Inc. All rights reserved. - * Copyright (c) 2011, 2018 by Delphix. All rights reserved. - * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. - * Copyright (c) 2013 Steven Hartland. All rights reserved. - * Copyright (c) 2014 Integros [integros.com] - * Copyright 2016 Toomas Soome - * Copyright (c) 2016 Actifio, Inc. All rights reserved. + * Copyright (c) 2011, Martin Matuska. All rights reserved. + * Copyright (c) 2015, OmniTI Computer Consulting Inc. All rights reserved. + * Copyright (c) 2012, Pawel Jakub Dawidek. All rights reserved. + * Copyright (c) 2014, 2016, Joyent Inc. All rights reserved. + * Copyright (c) 2016, Nexenta Systems Inc. All rights reserved. + * Copyright (c) 2011, 2018, Delphix. All rights reserved. + * Copyright (c) 2013, Saso Kiselkov. All rights reserved. + * Copyright (c) 2013, Steven Hartland. All rights reserved. + * Copyright (c) 2014, Integros. All rights reserved. + * Copyright (c) 2016, Toomas Soome. All rights reserved. + * Copyright (c) 2016, Actifio Inc. All rights reserved. * Copyright (c) 2018, loli10K . All rights reserved. - * Copyright 2017 RackTop Systems. - * Copyright (c) 2017 Open-E, Inc. All Rights Reserved. - * Copyright (c) 2019 Datto Inc. + * Copyright (c) 2017, RackTop Systems. All rights reserved. + * Copyright (c) 2017, Open-E Inc. All Rights Reserved. + * Copyright (c) 2019, Datto Inc. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Use is subject to license terms. */ /* diff --git a/module/zfs/zio.c b/module/zfs/zio.c index 788913e5bf05..9dfbdeee3137 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -18,11 +18,15 @@ * * CDDL HEADER END */ + /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011, 2019 by Delphix. All rights reserved. - * Copyright (c) 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2017, Intel Corporation. + * Copyright (c) 2011, 2019, Delphix. All rights reserved. + * Copyright (c) 2011, Nexenta Systems Inc. All rights reserved. + * Copyright (c) 2017, Intel Corporation. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. + * Use is subject to license terms. */ #include diff --git a/module/zfs/zio_compress.c b/module/zfs/zio_compress.c index 27af166a20bf..d2481f092f6a 100644 --- a/module/zfs/zio_compress.c +++ b/module/zfs/zio_compress.c @@ -20,16 +20,13 @@ */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2009, Sun Microsystems Inc. All rights reserved. + * Copyright (c) 2013, Saso Kiselkov. All rights reserved. + * Copyright (c) 2013, 2018, Delphix. All rights reserved. + * Copyright (c) 2019, Klara Inc. All rights reserved. + * Copyright (c) 2019, Allan Jude. All rights reserved. * Use is subject to license terms. */ -/* - * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. - */ - -/* - * Copyright (c) 2013, 2018 by Delphix. All rights reserved. - */ #include #include diff --git a/tests/zfs-tests/include/properties.shlib b/tests/zfs-tests/include/properties.shlib index f049f5193b02..1d9fc5538c42 100644 --- a/tests/zfs-tests/include/properties.shlib +++ b/tests/zfs-tests/include/properties.shlib @@ -13,7 +13,7 @@ # Copyright (c) 2012, 2016, Delphix. All rights reserved. # -typeset -a compress_prop_vals=('off' 'lzjb' 'lz4' 'gzip' 'zle') +typeset -a compress_prop_vals=('off' 'lzjb' 'lz4' 'gzip' 'zle' 'zstd') typeset -a checksum_prop_vals=('on' 'off' 'fletcher2' 'fletcher4' 'sha256' 'noparity' 'sha512' 'skein' 'edonr') typeset -a recsize_prop_vals=('512' '1024' '2048' '4096' '8192' '16384' diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg b/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg index 9dea1e2cd7a5..f9370645d68e 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg @@ -94,5 +94,6 @@ if is_linux; then "feature@resilver_defer" "feature@bookmark_v2" "feature@livelist" + "feature@zstd_compress" ) fi diff --git a/tests/zfs-tests/tests/functional/history/history_002_pos.ksh b/tests/zfs-tests/tests/functional/history/history_002_pos.ksh index 55332874573e..e89c90a4ec68 100755 --- a/tests/zfs-tests/tests/functional/history/history_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/history/history_002_pos.ksh @@ -86,7 +86,9 @@ props=( canmount off canmount on xattr on xattr off compression gzip compression gzip-$((RANDOM%9 + 1)) - copies $((RANDOM%3 + 1)) + compression zstd compression zstd-$((RANDOM%9 + 1)) + compression zstd-fast copies $((RANDOM%3 + 1)) + compression zstd-fast-$((RANDOM%9 + 1)) ) else # property value property value