Tag zfs-0.8.1

META file and changelog updated.

Signed-off-by: Tony Hutter <hutter2@llnl.gov>

.cirrus.yml

@@ -1,21 +0,0 @@
-env:
-  CIRRUS_CLONE_DEPTH: 1
-  ARCH: amd64
-
-build_task:
-  matrix:
-    freebsd_instance:
-      image_family: freebsd-13-5
-    freebsd_instance:
-      image_family: freebsd-14-2
-    freebsd_instance:
-      image_family: freebsd-15-0-snap
-  prepare_script:
-    - pkg install -y autoconf automake libtool gettext-runtime gmake ksh93 py311-packaging py311-cffi py311-sysctl
-  configure_script:
-    - env MAKE=gmake ./autogen.sh
-    - env MAKE=gmake ./configure --with-config="user" --with-python=3.11
-  build_script:
-    - gmake -j `sysctl -n kern.smp.cpus`
-  install_script:
-    - gmake install

.editorconfig

@@ -1,10 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{c,h}]
-tab_width = 8
-indent_style = tab

.github/CONTRIBUTING.md

@@ -1,12 +1,10 @@
-# Contributing to OpenZFS
-<p align="center">
-  <img alt="OpenZFS Logo"
-    src="https://openzfs.github.io/openzfs-docs/_static/img/logo/480px-Open-ZFS-Secondary-Logo-Colour-halfsize.png"/>
-</p>
+# Contributing to ZFS on Linux
+<p align="center"><img src="http://zfsonlinux.org/images/zfs-linux.png"/></p>
 
 *First of all, thank you for taking the time to contribute!*
 
-By using the following guidelines, you can help us make OpenZFS even better.
+By using the following guidelines, you can help us make ZFS on Linux even
+better.
 
 ## Table Of Contents
 [What should I know before I get
@@ -34,17 +32,17 @@ started?](#what-should-i-know-before-i-get-started)
 
 Helpful resources
 
-  * [OpenZFS Documentation](https://openzfs.github.io/openzfs-docs/)
-  * [OpenZFS Developer Resources](http://open-zfs.org/wiki/Developer_resources)
-  * [Git and GitHub for beginners](https://openzfs.github.io/openzfs-docs/Developer%20Resources/Git%20and%20GitHub%20for%20beginners.html)
+  * [ZFS on Linux wiki](https://github.com/zfsonlinux/zfs/wiki)
+  * [OpenZFS Documentation](http://open-zfs.org/wiki/Developer_resources)
+  * [Git and GitHub for beginners](https://github.com/zfsonlinux/zfs/wiki/Git-and-GitHub-for-beginners)
 
 ## What should I know before I get started?
 
 ### Get ZFS
 You can build zfs packages by following [these
-instructions](https://openzfs.github.io/openzfs-docs/Developer%20Resources/Building%20ZFS.html),
+instructions](https://github.com/zfsonlinux/zfs/wiki/Building-ZFS),
 or install stable packages from [your distribution's
-repository](https://openzfs.github.io/openzfs-docs/Getting%20Started/index.html).
+repository](https://github.com/zfsonlinux/zfs/wiki/Getting-Started).
 
 ### Debug ZFS
 A variety of methods and tools are available to aid ZFS developers.
@@ -53,30 +51,29 @@ configure option should be set. This will enable additional correctness
 checks and all the ASSERTs to help quickly catch potential issues.
 
 In addition, there are numerous utilities and debugging files which
-provide visibility into the inner workings of ZFS.  The most useful
-of these tools are discussed in detail on the [Troubleshooting
-page](https://openzfs.github.io/openzfs-docs/Basic%20Concepts/Troubleshooting.html).
+provide visibility in to the inner workings of ZFS.  The most useful
+of these tools are discussed in detail on the [debugging ZFS wiki
+page](https://github.com/zfsonlinux/zfs/wiki/Debugging).
 
 ### Where can I ask for help?
-The [zfs-discuss mailing
-list](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html)
-or IRC are the best places to ask for help. Please do not file
-support requests on the GitHub issue tracker.
+[The zfs-discuss mailing list or IRC](http://list.zfsonlinux.org)
+are the best places to ask for help. Please do not file support requests
+on the GitHub issue tracker.
 
 ## How Can I Contribute?
 
 ### Reporting Bugs
 *Please* contact us via the [zfs-discuss mailing
-list](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html)
-or IRC if you aren't certain that you are experiencing a bug.
+list or IRC](http://list.zfsonlinux.org) if you aren't
+certain that you are experiencing a bug.
 
 If you run into an issue, please search our [issue
-tracker](https://github.com/openzfs/zfs/issues) *first* to ensure the
+tracker](https://github.com/zfsonlinux/zfs/issues) *first* to ensure the
 issue hasn't been reported before. Open a new issue only if you haven't
 found anything similar to your issue.
 
 You can open a new issue and search existing issues using the public [issue
-tracker](https://github.com/openzfs/zfs/issues).
+tracker](https://github.com/zfsonlinux/zfs/issues).
 
 #### When opening a new issue, please include the following information at the top of the issue:
 * What distribution (with version) you are using.
@@ -108,13 +105,13 @@ information like:
 * Stack traces which may be logged to `dmesg`.
 
 ### Suggesting Enhancements
-OpenZFS is a widely deployed production filesystem which is under active
-development. The team's primary focus is on fixing known issues, improving
-performance, and adding compelling new features.
+ZFS on Linux is a widely deployed production filesystem which is under
+active development. The team's primary focus is on fixing known issues,
+improving performance, and adding compelling new features.
 
 You can view the list of proposed features
-by filtering the issue tracker by the ["Type: Feature"
-label](https://github.com/openzfs/zfs/issues?q=is%3Aopen+is%3Aissue+label%3A%22Type%3A+Feature%22).
+by filtering the issue tracker by the ["Feature"
+label](https://github.com/zfsonlinux/zfs/issues?q=is%3Aopen+is%3Aissue+label%3AFeature).
 If you have an idea for a feature first check this list. If your idea already
 appears then add a +1 to the top most comment, this helps us gauge interest
 in that feature.
@@ -123,11 +120,8 @@ Otherwise, open a new issue and describe your proposed feature.  Why is this
 feature needed?  What problem does it solve?
 
 ### Pull Requests
-
-#### General
-
-* All pull requests, except backports and releases, must be based on the current master branch 
-and should apply without conflicts.
+* All pull requests must be based on the current master branch and apply
+without conflicts.
 * Please attempt to limit pull requests to a single commit which resolves
 one specific issue.
 * Make sure your commit messages are in the correct format. See the
@@ -139,24 +133,16 @@ logically independent patches which build on each other.  This makes large
 changes easier to review and approve which speeds up the merging process.
 * Try to keep pull requests simple. Simple code with comments is much easier
 to review and approve.
-* All proposed changes must be approved by an OpenZFS organization member.
-* If you have an idea you'd like to discuss or which requires additional testing, consider opening it as a draft pull request.
-Once everything is in good shape and the details have been worked out you can remove its draft status.
-Any required reviews can then be finalized and the pull request merged.
-
-#### Tests and Benchmarks
-* Every pull request is tested using a GitHub Actions workflow on multiple platforms by running the [zfs-tests.sh and zloop.sh](
-https://openzfs.github.io/openzfs-docs/Developer%20Resources/Building%20ZFS.html#running-zloop-sh-and-zfs-tests-sh) test suites.
-`.github/workflows/scripts/generate-ci-type.py` is used to determine whether the pull request is nonbehavior, i.e., not introducing behavior changes of any code, configuration or tests. If so, the CI will run on fewer platforms and only essential sanity tests will run. You can always override this by adding `ZFS-CI-Type` line to your commit message:
-  * If your last commit (or `HEAD` in git terms) contains a line `ZFS-CI-Type: quick`, quick mode is forced regardless of what files are changed.
-  * Otherwise, if any commit in a PR contains a line `ZFS-CI-Type: full`, full mode is forced.
-* To verify your changes conform to the [style guidelines](
-https://github.com/openzfs/zfs/blob/master/.github/CONTRIBUTING.md#style-guides
-), please run `make checkstyle` and resolve any warnings.
-* Code analysis is performed by [CodeQL](https://codeql.github.com/) for each pull request.
-* Test cases should be provided when appropriate.  This includes making sure new features have adequate code coverage.
+* Test cases should be provided when appropriate.
 * If your pull request improves performance, please include some benchmarks.
-* The pull request must pass all CI checks before being accepted.
+* The pull request must pass all required [ZFS
+Buildbot](http://build.zfsonlinux.org/) builders before
+being accepted. If you are experiencing intermittent TEST
+builder failures, you may be experiencing a [test suite
+issue](https://github.com/zfsonlinux/zfs/issues?q=is%3Aissue+is%3Aopen+label%3A%22Test+Suite%22).
+There are also various [buildbot options](https://github.com/zfsonlinux/zfs/wiki/Buildbot-Options)
+to control how changes are tested.
+* All proposed changes must be approved by a ZFS on Linux organization member.
 
 ### Testing
 All help is appreciated! If you're in a position to run the latest code
@@ -166,41 +152,16 @@ range of realistic workloads, configurations and architectures we're better
 able quickly identify and resolve potential issues.
 
 Users can also run the [ZFS Test
-Suite](https://github.com/openzfs/zfs/tree/master/tests) on their systems
+Suite](https://github.com/zfsonlinux/zfs/tree/master/tests) on their systems
 to verify ZFS is behaving as intended.
 
 ## Style Guides
 
-### Repository Structure
-
-OpenZFS uses a standardised branching structure.
-- The "development and main branch", is the branch all development should be based on.
-- "Release branches" contain the latest released code for said version.
-- "Staging branches" contain selected commits prior to being released.
-
-**Branch Names:**
-- Development and Main branch: `master`
-- Release branches: `zfs-$VERSION-release`
-- Staging branches: `zfs-$VERSION-staging`
-
-`$VERSION` should be replaced with the `major.minor` version number.  
-_(This is the version number without the `.patch` version at the end)_
-
 ### Coding Conventions
 We currently use [C  Style  and  Coding  Standards  for
 SunOS](http://www.cis.upenn.edu/%7Elee/06cse480/data/cstyle.ms.pdf) as our
 coding convention.
 
-This repository has an `.editorconfig` file. If your editor [supports
-editorconfig](https://editorconfig.org/#download), it will
-automatically respect most of this project's whitespace preferences.
-
-Additionally, Git can help warn on whitespace problems as well:
-
-```
-git config --local core.whitespace trailing-space,space-before-tab,indent-with-non-tab,-tab-in-indent
-```
-
 ### Commit Message Formats
 #### New Changes
 Commit messages for new changes must meet the following guidelines:
@@ -226,6 +187,70 @@ attempting to solve.
 Signed-off-by: Contributor <contributor@email.com>
 ```
 
+#### OpenZFS Patch Ports
+If you are porting OpenZFS patches, the commit message must meet
+the following guidelines:
+* The first line must be the summary line from the most important OpenZFS commit being ported.
+It must begin with `OpenZFS dddd, dddd - ` where `dddd` are OpenZFS issue numbers.
+* Provides a `Authored by:` line to attribute each patch for each original author.
+* Provides the `Reviewed by:` and `Approved by:` lines from each original
+OpenZFS commit.
+* Provides a `Ported-by:` line with the developer's name followed by
+their email for each OpenZFS commit.
+* Provides a `OpenZFS-issue:` line with link for each original illumos
+issue.
+* Provides a `OpenZFS-commit:` line with link for each original OpenZFS commit.
+* If necessary, provide some porting notes to describe any deviations from
+the original OpenZFS commits.
+
+An example OpenZFS patch port commit message for a single patch is provided
+below.
+```
+OpenZFS 1234 - Summary from the original OpenZFS commit
+
+Authored by: Original Author <original@email.com>
+Reviewed by: Reviewer One <reviewer1@email.com>
+Reviewed by: Reviewer Two <reviewer2@email.com>
+Approved by: Approver One <approver1@email.com>
+Ported-by: ZFS Contributor <contributor@email.com>
+
+Provide some porting notes here if necessary.
+
+OpenZFS-issue: https://www.illumos.org/issues/1234
+OpenZFS-commit: https://github.com/openzfs/openzfs/commit/abcd1234
+```
+
+If necessary, multiple OpenZFS patches can be combined in a single port.
+This is useful when you are porting a new patch and its subsequent bug
+fixes. An example commit message is provided below.
+```
+OpenZFS 1234, 5678 - Summary of most important OpenZFS commit
+
+1234 Summary from original OpenZFS commit for 1234
+
+Authored by: Original Author <original@email.com>
+Reviewed by: Reviewer Two <reviewer2@email.com>
+Approved by: Approver One <approver1@email.com>
+Ported-by: ZFS Contributor <contributor@email.com>
+
+Provide some porting notes here for 1234 if necessary.
+
+OpenZFS-issue: https://www.illumos.org/issues/1234
+OpenZFS-commit: https://github.com/openzfs/openzfs/commit/abcd1234
+
+5678 Summary from original OpenZFS commit for 5678
+
+Authored by: Original Author2 <original2@email.com>
+Reviewed by: Reviewer One <reviewer1@email.com>
+Approved by: Approver Two <approver2@email.com>
+Ported-by: ZFS Contributor <contributor@email.com>
+
+Provide some porting notes here for 5678 if necessary.
+
+OpenZFS-issue: https://www.illumos.org/issues/5678
+OpenZFS-commit: https://github.com/openzfs/openzfs/commit/efgh5678
+```
+
 #### Coverity Defect Fixes
 If you are submitting a fix to a
 [Coverity defect](https://scan.coverity.com/projects/zfsonlinux-zfs),
@@ -265,13 +290,3 @@ Git can append the `Signed-off-by` line to your commit messages. Simply
 provide the `-s` or `--signoff` option when performing a `git commit`.
 For more information about writing commit messages, visit [How to Write
 a Git Commit Message](https://chris.beams.io/posts/git-commit/).
-
-#### Co-authored By
-If someone else had part in your pull request, please add the following to the commit:
-`Co-authored-by: Name <gitregistered@email.address>`
-This is useful if their authorship was lost during squashing, rebasing, etc.,
-but may be used in any situation where there are co-authors.
-
-The email address used here should be the same as on the GitHub profile of said user.
-If said user does not have their email address public, please use the following instead:
-`Co-authored-by: Name <[username]@users.noreply.github.com>`

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,48 @@
+<!-- Please fill out the following template, which will help other contributors address your issue. -->
+
+<!--
+Thank you for reporting an issue.
+
+*IMPORTANT* - Please search our issue tracker *before* making a new issue.
+If you cannot find a similar issue, then create a new issue.
+https://github.com/zfsonlinux/zfs/issues 
+
+*IMPORTANT* - This issue tracker is for *bugs* and *issues* only.
+Please search the wiki and the mailing list archives before asking 
+questions on the mailing list.
+https://github.com/zfsonlinux/zfs/wiki/Mailing-Lists
+
+Please fill in as much of the template as possible.
+-->
+
+### System information
+<!--  add version after "|" character -->
+Type | Version/Name
+ --- | --- 
+Distribution Name	| 
+Distribution Version	| 
+Linux Kernel	| 
+Architecture	| 
+ZFS Version	| 
+SPL Version	| 
+<!-- 
+Commands to find ZFS/SPL versions:
+modinfo zfs | grep -iw version
+modinfo spl | grep -iw version 
+-->
+
+### Describe the problem you're observing
+
+### Describe how to reproduce the problem
+
+### Include any warning/errors/backtraces from the system logs
+<!-- 
+*IMPORTANT* - Please mark logs and text output from terminal commands 
+or else Github will not display them correctly. 
+An example is provided below.
+
+Example:
+```
+this is an example how log text should be marked (wrap it with ```)
+```
+-->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,55 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve OpenZFS
-title: ''
-labels: 'Type: Defect'
-assignees: ''
-
----
-
-<!-- Please fill out the following template, which will help other contributors address your issue. -->
-
-<!--
-Thank you for reporting an issue.
-
-*IMPORTANT* - Please check our issue tracker before opening a new issue.
-Additional valuable information can be found in the OpenZFS documentation
-and mailing list archives.
-
-Please fill in as much of the template as possible.
--->
-
-### System information
-<!--  add version after "|" character -->
-Type | Version/Name
- --- | ---
-Distribution Name	|
-Distribution Version	|
-Kernel Version	|
-Architecture	|
-OpenZFS Version	|
-<!--
-Command to find OpenZFS version:
-zfs version
-
-Commands to find kernel version:
-uname -r		# Linux
-freebsd-version -r	# FreeBSD
--->
-
-### Describe the problem you're observing
-
-### Describe how to reproduce the problem
-
-### Include any warning/errors/backtraces from the system logs
-<!--
-*IMPORTANT* - Please mark logs and text output from terminal commands
-or else Github will not display them correctly.
-An example is provided below.
-
-Example:
-```
-this is an example how log text should be marked (wrap it with ```)
-```
--->
-

.github/ISSUE_TEMPLATE/config.yml

@@ -1,14 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: OpenZFS Questions
-    url: https://github.com/openzfs/zfs/discussions/new
-    about: Ask the community for help
-  - name: OpenZFS Community Support Mailing list (Linux)
-    url: https://zfsonlinux.topicbox.com/groups/zfs-discuss
-    about: Get community support for OpenZFS on Linux
-  - name: FreeBSD Community Support Mailing list
-    url: https://lists.freebsd.org/mailman/listinfo/freebsd-fs
-    about: Get community support for OpenZFS on FreeBSD
-  - name: OpenZFS on IRC
-    url: https://web.libera.chat/#openzfs
-    about: Use IRC to get community support for OpenZFS

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,33 +0,0 @@
----
-name: Feature request
-about: Suggest a feature for OpenZFS
-title: ''
-labels: 'Type: Feature'
-assignees: ''
-
----
-
-<!--
-Thank you for suggesting a feature.
-
-Please check our issue tracker before opening a new feature request.
-Filling out the following template will help other contributors better understand your proposed feature.
--->
-
-### Describe the feature would like to see added to OpenZFS
-
-<!--
-Provide a clear and concise description of the feature.
--->
-
-### How will this feature improve OpenZFS?
-
-<!--
-What problem does this feature solve?
--->
-
-### Additional context
-
-<!--
-Any additional information you can add about the proposal?
--->

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,7 +4,7 @@
 
 <!---
 Documentation on ZFS Buildbot options can be found at
-https://openzfs.github.io/openzfs-docs/Developer%20Resources/Buildbot%20Options.html
+https://github.com/zfsonlinux/zfs/wiki/Buildbot-Options
 -->
 
 ### Motivation and Context
@@ -19,7 +19,6 @@ https://openzfs.github.io/openzfs-docs/Developer%20Resources/Buildbot%20Options.
 <!--- Include details of your testing environment, and the tests you ran to -->
 <!--- see how your change affects other areas of the code, etc. -->
 <!--- If your change is a performance enhancement, please provide benchmarks here. -->
-<!--- Please think about using the draft PR feature if appropriate -->
 
 ### Types of changes
 <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
@@ -28,15 +27,14 @@ https://openzfs.github.io/openzfs-docs/Developer%20Resources/Buildbot%20Options.
 - [ ] Performance enhancement (non-breaking change which improves efficiency)
 - [ ] Code cleanup (non-breaking change which makes code smaller or more readable)
 - [ ] Breaking change (fix or feature that would cause existing functionality to change)
-- [ ] Library ABI change (libzfs, libzfs\_core, libnvpair, libuutil and libzfsbootenv)
 - [ ] Documentation (a change to man pages or other documentation)
 
 ### Checklist:
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] My code follows the OpenZFS [code style requirements](https://github.com/openzfs/zfs/blob/master/.github/CONTRIBUTING.md#coding-conventions).
+- [ ] My code follows the ZFS on Linux [code style requirements](https://github.com/zfsonlinux/zfs/blob/master/.github/CONTRIBUTING.md#coding-conventions).
 - [ ] I have updated the documentation accordingly.
-- [ ] I have read the [**contributing** document](https://github.com/openzfs/zfs/blob/master/.github/CONTRIBUTING.md).
-- [ ] I have added [tests](https://github.com/openzfs/zfs/tree/master/tests) to cover my changes.
-- [ ] I have run the ZFS Test Suite with this change applied.
-- [ ] All commit messages are properly formatted and contain [`Signed-off-by`](https://github.com/openzfs/zfs/blob/master/.github/CONTRIBUTING.md#signed-off-by).
+- [ ] I have read the [**contributing** document](https://github.com/zfsonlinux/zfs/blob/master/.github/CONTRIBUTING.md).
+- [ ] I have added [tests](https://github.com/zfsonlinux/zfs/tree/master/tests) to cover my changes.
+- [ ] All new and existing tests passed.
+- [ ] All commit messages are properly formatted and contain [`Signed-off-by`](https://github.com/zfsonlinux/zfs/blob/master/.github/CONTRIBUTING.md#signed-off-by).

.github/codecov.yml

@@ -4,8 +4,7 @@ codecov:
     after_n_builds: 2		# user and kernel
 
 coverage:
-  precision: 0			# 0 decimals of precision
-  round: nearest        # Round to nearest precision point
+  precision: 2			# 2 digits of precision
   range: "50...90"		# red -> yellow -> green
 
   status:
@@ -21,5 +20,3 @@ comment:
   layout: "reach, diff, flags, footer"
   behavior: once		# update if exists; post new; skip if deleted
   require_changes: yes		# only post when coverage changes
-
-# ignore: Please place any ignores in config/ax_code_coverage.m4 instead

.github/codeql-cpp.yml

@@ -1,4 +0,0 @@
-name: "Custom CodeQL Analysis"
-
-queries:
-  - uses: ./.github/codeql/custom-queries/cpp/deprecatedFunctionUsage.ql

.github/codeql-python.yml

@@ -1,4 +0,0 @@
-name: "Custom CodeQL Analysis"
-
-paths-ignore:
-  - tests

.github/codeql/custom-queries/cpp/deprecatedFunctionUsage.ql

@@ -1,59 +0,0 @@
-/**
- * @name Deprecated function usage detection
- * @description Detects functions whose usage is banned from the OpenZFS
- *              codebase due to QA concerns.
- * @kind problem
- * @severity error
- * @id cpp/deprecated-function-usage
-*/
-
-import cpp
-
-predicate isDeprecatedFunction(Function f) {
-  f.getName() = "strtok" or
-  f.getName() = "__xpg_basename" or
-  f.getName() = "basename" or
-  f.getName() = "dirname" or
-  f.getName() = "bcopy" or
-  f.getName() = "bcmp" or
-  f.getName() = "bzero" or
-  f.getName() = "asctime" or
-  f.getName() = "asctime_r" or
-  f.getName() = "gmtime" or
-  f.getName() = "localtime" or
-  f.getName() = "strncpy"
-
-}
-
-string getReplacementMessage(Function f) {
-  if f.getName() = "strtok" then
-    result = "Use strtok_r(3) instead!"
-  else if f.getName() = "__xpg_basename" then
-    result = "basename(3) is underspecified. Use zfs_basename() instead!"
-  else if f.getName() = "basename" then
-    result = "basename(3) is underspecified. Use zfs_basename() instead!"
-  else if f.getName() = "dirname" then
-    result = "dirname(3) is underspecified. Use zfs_dirnamelen() instead!"
-  else if f.getName() = "bcopy" then
-    result = "bcopy(3) is deprecated. Use memcpy(3)/memmove(3) instead!"
-  else if f.getName() = "bcmp" then
-    result = "bcmp(3) is deprecated. Use memcmp(3) instead!"
-  else if f.getName() = "bzero" then
-    result = "bzero(3) is deprecated. Use memset(3) instead!"
-  else if f.getName() = "asctime" then
-    result = "Use strftime(3) instead!"
-  else if f.getName() = "asctime_r" then
-    result = "Use strftime(3) instead!"
-  else if f.getName() = "gmtime" then
-    result = "gmtime(3) isn't thread-safe. Use gmtime_r(3) instead!"
-  else if f.getName() = "localtime" then
-    result = "localtime(3) isn't thread-safe. Use localtime_r(3) instead!"
-  else
-    result = "strncpy(3) is deprecated. Use strlcpy(3) instead!"
-}
-
-from FunctionCall fc, Function f
-where
-  fc.getTarget() = f and
-  isDeprecatedFunction(f)
-select fc, getReplacementMessage(f)

.github/codeql/custom-queries/cpp/qlpack.yml

@@ -1,4 +0,0 @@
-name: openzfs-cpp-queries
-version: 0.0.0
-libraryPathDependencies: codeql-cpp
-suites: openzfs-cpp-suite

.github/no-response.yml

@@ -1,13 +0,0 @@
-# Configuration for probot-no-response - https://github.com/probot/no-response
-
-# Number of days of inactivity before an Issue is closed for lack of response
-daysUntilClose: 31
-# Label requiring a response
-responseRequiredLabel: "Status: Feedback requested"
-# Comment to post when closing an Issue for lack of response. Set to `false` to disable
-closeComment: >
-  This issue has been automatically closed because there has been no response
-  to our request for more information from the original author. With only the
-  information that is currently in the issue, we don't have enough information
-  to take action. Please reach out if you have or find the answers we need so
-  that we can investigate further.

.github/stale.yml

@@ -1,26 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 365
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 90
-# Limit to only `issues` or `pulls`
-only: issues
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - "Type: Feature"
-  - "Bot: Not Stale"
-  - "Status: Work in Progress"
-# Set to true to ignore issues in a project (defaults to false)
-exemptProjects: true
-# Set to true to ignore issues in a milestone (defaults to false)
-exemptMilestones: true
-# Set to true to ignore issues with an assignee (defaults to false)
-exemptAssignees: true
-# Label to use when marking an issue as stale
-staleLabel: "Status: Stale"
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as "stale" because it has not had
-  any activity for a while. It will be closed in 90 days if no further activity occurs. 
-  Thank you for your contributions.
-# Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 6

.github/suppressions.txt

@@ -0,0 +1,3 @@
+preprocessorErrorDirective:./module/zfs/vdev_raidz_math_avx512f.c:243
+preprocessorErrorDirective:./module/zfs/vdev_raidz_math_sse2.c:266
+

.github/workflows/README.md

@@ -1,61 +0,0 @@
-
-## The testings are done this way
-
-```mermaid
-flowchart TB
-subgraph CleanUp and Summary
-  CleanUp+Summary
-end
-
-subgraph Functional Testings
-  sanity-checks-20.04
-  zloop-checks-20.04
-  functional-testing-20.04-->Part1-20.04
-  functional-testing-20.04-->Part2-20.04
-  functional-testing-20.04-->Part3-20.04
-  functional-testing-20.04-->Part4-20.04
-  functional-testing-22.04-->Part1-22.04
-  functional-testing-22.04-->Part2-22.04
-  functional-testing-22.04-->Part3-22.04
-  functional-testing-22.04-->Part4-22.04
-  sanity-checks-22.04
-  zloop-checks-22.04
-end
-
-subgraph Code Checking + Building
-  Build-Ubuntu-20.04
-  codeql.yml
-  checkstyle.yml
-  Build-Ubuntu-22.04
-end
-
-  Build-Ubuntu-20.04-->sanity-checks-20.04
-  Build-Ubuntu-20.04-->zloop-checks-20.04
-  Build-Ubuntu-20.04-->functional-testing-20.04
-  Build-Ubuntu-22.04-->sanity-checks-22.04
-  Build-Ubuntu-22.04-->zloop-checks-22.04
-  Build-Ubuntu-22.04-->functional-testing-22.04
-
-  sanity-checks-20.04-->CleanUp+Summary
-  Part1-20.04-->CleanUp+Summary
-  Part2-20.04-->CleanUp+Summary
-  Part3-20.04-->CleanUp+Summary
-  Part4-20.04-->CleanUp+Summary
-  Part1-22.04-->CleanUp+Summary
-  Part2-22.04-->CleanUp+Summary
-  Part3-22.04-->CleanUp+Summary
-  Part4-22.04-->CleanUp+Summary
-  sanity-checks-22.04-->CleanUp+Summary
-```
-
-
-1) build zfs modules for Ubuntu 20.04 and 22.04 (~15m)
-2) 2x zloop test (~10m) + 2x sanity test (~25m)
-3) 4x functional testings in parts 1..4 (each ~1h)
-4) cleanup and create summary
-   - content of summary depends on the results of the steps
-
-When everything runs fine, the full run should be done in
-about 2 hours.
-
-The codeql.yml and checkstyle.yml are not part in this circle.

.github/workflows/checkstyle.yaml

@@ -1,64 +0,0 @@
-name: checkstyle
-
-on:
-  push:
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  checkstyle:
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-    - name: Install dependencies
-      run: |
-        # for x in lxd core20 snapd; do sudo snap remove $x; done
-        sudo apt-get purge -y snapd google-chrome-stable firefox
-        ONLY_DEPS=1 .github/workflows/scripts/qemu-3-deps-vm.sh ubuntu22
-        sudo apt-get install -y cppcheck devscripts mandoc pax-utils shellcheck
-        sudo python -m pipx install --quiet flake8
-        # confirm that the tools are installed
-        # the build system doesn't fail when they are not
-        checkbashisms --version
-        cppcheck --version
-        flake8 --version
-        scanelf --version
-        shellcheck --version
-    - name: Prepare
-      run: |
-        sed -i '/DEBUG_CFLAGS="-Werror"/s/^/#/' config/zfs-build.m4
-        ./autogen.sh
-    - name: Configure
-      run: |
-        ./configure
-    - name: Make
-      run: |
-        make -j$(nproc) --no-print-directory --silent
-    - name: Checkstyle
-      run: |
-        make -j$(nproc) --no-print-directory --silent checkstyle
-    - name: Lint
-      run: |
-        make -j$(nproc) --no-print-directory --silent lint
-    - name: CheckABI
-      id: CheckABI
-      run: |
-        docker run -v $PWD:/source ghcr.io/openzfs/libabigail make -j$(nproc) --no-print-directory --silent checkabi
-    - name: StoreABI
-      if: failure() && steps.CheckABI.outcome == 'failure'
-      run: |
-        docker run -v $PWD:/source ghcr.io/openzfs/libabigail make -j$(nproc) --no-print-directory --silent storeabi
-    - name: Prepare artifacts
-      if: failure() && steps.CheckABI.outcome == 'failure'
-      run: |
-        find -name *.abi | tar -cf abi_files.tar -T -
-    - uses: actions/upload-artifact@v4
-      if: failure() && steps.CheckABI.outcome == 'failure'
-      with:
-        name: New ABI files (use only if you're sure about interface changes)
-        path: abi_files.tar

.github/workflows/codeql.yml

@@ -1,45 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-22.04
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'cpp', 'python' ]
-
-    steps:
-    - name: Set make jobs
-      run: |
-        echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV
-
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        config-file: .github/codeql-${{ matrix.language }}.yml
-        languages: ${{ matrix.language }}
-
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:${{matrix.language}}"

.github/workflows/scripts/README.md

@@ -1,14 +0,0 @@
-
-Workflow for each operating system:
-- install qemu on the github runner
-- download current cloud image of operating system
-- start and init that image via cloud-init
-- install dependencies and poweroff system
-- start system and build openzfs and then poweroff again
-- clone build system and start 2 instances of it
-- run functional testings and complete in around 3h
-- when tests are done, do some logfile preparing
-- show detailed results for each system
-- in the end, generate the job summary
-
-/TR 14.09.2024

.github/workflows/scripts/generate-ci-type.py

@@ -1,107 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Determine the CI type based on the change list and commit message.
-
-Prints "quick" if (explicity required by user):
-- the *last* commit message contains 'ZFS-CI-Type: quick'
-or if (heuristics):
-- the files changed are not in the list of specified directories, and
-- all commit messages do not contain 'ZFS-CI-Type: full'
-
-Otherwise prints "full".
-"""
-
-import sys
-import subprocess
-import re
-
-"""
-Patterns of files that are not considered to trigger full CI.
-Note: not using pathlib.Path.match() because it does not support '**'
-"""
-FULL_RUN_IGNORE_REGEX = list(map(re.compile, [
-    r'.*\.md',
-    r'.*\.gitignore'
-]))
-
-"""
-Patterns of files that are considered to trigger full CI.
-"""
-FULL_RUN_REGEX = list(map(re.compile, [
-    r'cmd.*',
-    r'configs/.*',
-    r'META',
-    r'.*\.am',
-    r'.*\.m4',
-    r'autogen\.sh',
-    r'configure\.ac',
-    r'copy-builtin',
-    r'contrib',
-    r'etc',
-    r'include',
-    r'lib/.*',
-    r'module/.*',
-    r'scripts/.*',
-    r'tests/.*',
-    r'udev/.*'
-]))
-
-if __name__ == '__main__':
-
-    prog = sys.argv[0]
-
-    if len(sys.argv) != 3:
-        print(f'Usage: {prog} <head_ref> <base_ref>')
-        sys.exit(1)
-
-    head, base = sys.argv[1:3]
-
-    def output_type(type, reason):
-        print(f'{prog}: will run {type} CI: {reason}', file=sys.stderr)
-        print(type)
-        sys.exit(0)
-
-    # check last (HEAD) commit message
-    last_commit_message_raw = subprocess.run([
-        'git', 'show', '-s', '--format=%B', 'HEAD'
-    ], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-    for line in last_commit_message_raw.stdout.decode().splitlines():
-        if line.strip().lower() == 'zfs-ci-type: quick':
-            output_type('quick', f'explicitly requested by HEAD commit {head}')
-
-    # check all commit messages
-    all_commit_message_raw = subprocess.run([
-        'git', 'show', '-s',
-        '--format=ZFS-CI-Commit: %H%n%B', f'{head}...{base}'
-    ], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    all_commit_message = all_commit_message_raw.stdout.decode().splitlines()
-
-    commit_ref = head
-    for line in all_commit_message:
-        if line.startswith('ZFS-CI-Commit:'):
-            commit_ref = line.lstrip('ZFS-CI-Commit:').rstrip()
-        if line.strip().lower() == 'zfs-ci-type: full':
-            output_type('full', f'explicitly requested by commit {commit_ref}')
-
-    # check changed files
-    changed_files_raw = subprocess.run([
-        'git', 'diff', '--name-only', head, base
-    ], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    changed_files = changed_files_raw.stdout.decode().splitlines()
-
-    for f in changed_files:
-        for r in FULL_RUN_IGNORE_REGEX:
-            if r.match(f):
-                break
-        else:
-            for r in FULL_RUN_REGEX:
-                if r.match(f):
-                    output_type(
-                        'full',
-                        f'changed file "{f}" matches pattern "{r.pattern}"'
-                        )
-
-    # catch-all
-    output_type('quick', 'no changed file matches full CI patterns')

.github/workflows/scripts/merge_summary.awk

@@ -1,109 +0,0 @@
-#!/bin/awk -f
-#
-# Merge multiple ZTS tests results summaries into a single summary.  This is
-# needed when you're running different parts of ZTS on different tests
-# runners or VMs.
-#
-# Usage:
-#
-#	./merge_summary.awk summary1.txt [summary2.txt] [summary3.txt] ...
-#
-#	or:
-#
-#	cat summary*.txt | ./merge_summary.awk
-#
-BEGIN {
-	i=-1
-	pass=0
-	fail=0
-	skip=0
-	state=""
-	cl=0
-	el=0
-	upl=0
-	ul=0
-
-	# Total seconds of tests runtime
-	total=0;
-}
-
-# Skip empty lines
-/^\s*$/{next}
-
-# Skip Configuration and Test lines
-/^Test:/{state=""; next}
-/Configuration/{state="";next}
-
-# When we see "test-runner.py" stop saving config lines, and
-# save test runner lines
-/test-runner.py/{state="testrunner"; runner=runner$0"\n"; next}
-
-# We need to differentiate the PASS counts from test result lines that start
-# with PASS, like:
-#
-#   PASS mv_files/setup
-#
-# Use state="pass_count" to differentiate
-#
-/Results Summary/{state="pass_count"; next}
-/PASS/{ if (state=="pass_count") {pass += $2}}
-/FAIL/{ if (state=="pass_count") {fail += $2}}
-/SKIP/{ if (state=="pass_count") {skip += $2}}
-/Running Time/{
-	state="";
-	running[i]=$3;
-	split($3, arr, ":")
-	total += arr[1] * 60 * 60;
-	total += arr[2] * 60;
-	total += arr[3]
-	next;
-}
-
-/Tests with results other than PASS that are expected/{state="expected_lines"; next}
-/Tests with result of PASS that are unexpected/{state="unexpected_pass_lines"; next}
-/Tests with results other than PASS that are unexpected/{state="unexpected_lines"; next}
-{
-	if (state == "expected_lines") {
-		expected_lines[el] = $0
-		el++
-	}
-
-	if (state == "unexpected_pass_lines") {
-		unexpected_pass_lines[upl] = $0
-		upl++
-	}
-	if (state == "unexpected_lines") {
-		unexpected_lines[ul] = $0
-		ul++
-	}
-}
-
-# Reproduce summary
-END {
-	print runner;
-	print "\nResults Summary"
-	print "PASS\t"pass
-	print "FAIL\t"fail
-	print "SKIP\t"skip
-	print ""
-	print "Running Time:\t"strftime("%T", total, 1)
-	if (pass+fail+skip > 0) {
-		percent_passed=(pass/(pass+fail+skip) * 100)
-	}
-	printf "Percent passed:\t%3.2f%", percent_passed
-
-	print "\n\nTests with results other than PASS that are expected:"
-	asort(expected_lines, sorted)
-	for (j in sorted)
-		print sorted[j]
-
-	print "\n\nTests with result of PASS that are unexpected:"
-	asort(unexpected_pass_lines, sorted)
-	for (j in sorted)
-		print sorted[j]
-
-	print "\n\nTests with results other than PASS that are unexpected:"
-	asort(unexpected_lines, sorted)
-	for (j in sorted)
-		print sorted[j]
-}

.github/workflows/scripts/qemu-1-setup.sh

@@ -1,93 +0,0 @@
-#!/usr/bin/env bash
-
-######################################################################
-# 1) setup qemu instance on action runner
-######################################################################
-
-set -eu
-
-# install needed packages
-export DEBIAN_FRONTEND="noninteractive"
-sudo apt-get -y update
-sudo apt-get install -y axel cloud-image-utils daemonize guestfs-tools \
-  ksmtuned virt-manager linux-modules-extra-$(uname -r) zfsutils-linux
-
-# generate ssh keys
-rm -f ~/.ssh/id_ed25519
-ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519 -q -N ""
-
-# we expect RAM shortage
-cat << EOF | sudo tee /etc/ksmtuned.conf > /dev/null
-# /etc/ksmtuned.conf - Configuration file for ksmtuned
-# https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/7/html/virtualization_tuning_and_optimization_guide/chap-ksm
-KSM_MONITOR_INTERVAL=60
-
-# Millisecond sleep between ksm scans for 16Gb server.
-# Smaller servers sleep more, bigger sleep less.
-KSM_SLEEP_MSEC=30
-
-KSM_NPAGES_BOOST=0
-KSM_NPAGES_DECAY=0
-KSM_NPAGES_MIN=1000
-KSM_NPAGES_MAX=25000
-
-KSM_THRES_COEF=80
-KSM_THRES_CONST=8192
-
-LOGFILE=/var/log/ksmtuned.log
-DEBUG=1
-EOF
-sudo systemctl restart ksm
-sudo systemctl restart ksmtuned
-
-# not needed
-sudo systemctl stop docker.socket
-sudo systemctl stop multipathd.socket
-
-# remove default swapfile and /mnt
-sudo swapoff -a
-sudo umount -l /mnt
-DISK="/dev/disk/cloud/azure_resource-part1"
-sudo sed -e "s|^$DISK.*||g" -i /etc/fstab
-sudo wipefs -aq $DISK
-sudo systemctl daemon-reload
-
-sudo modprobe loop
-sudo modprobe zfs
-
-# partition the disk as needed
-DISK="/dev/disk/cloud/azure_resource"
-sudo sgdisk --zap-all $DISK
-sudo sgdisk -p \
- -n 1:0:+16G -c 1:"swap" \
- -n 2:0:0    -c 2:"tests" \
-$DISK
-sync
-sleep 1
-
-# swap with same size as RAM
-sudo mkswap $DISK-part1
-sudo swapon $DISK-part1
-
-# 60GB data disk
-SSD1="$DISK-part2"
-
-# 10GB data disk on ext4
-sudo fallocate -l 10G /test.ssd1
-SSD2=$(sudo losetup -b 4096 -f /test.ssd1 --show)
-
-# adjust zfs module parameter and create pool
-exec 1>/dev/null
-ARC_MIN=$((1024*1024*256))
-ARC_MAX=$((1024*1024*512))
-echo $ARC_MIN | sudo tee /sys/module/zfs/parameters/zfs_arc_min
-echo $ARC_MAX | sudo tee /sys/module/zfs/parameters/zfs_arc_max
-echo 1 | sudo tee /sys/module/zfs/parameters/zvol_use_blk_mq
-sudo zpool create -f -o ashift=12 zpool $SSD1 $SSD2 \
-  -O relatime=off -O atime=off -O xattr=sa -O compression=lz4 \
-  -O mountpoint=/mnt/tests
-
-# no need for some scheduler
-for i in /sys/block/s*/queue/scheduler; do
-  echo "none" | sudo tee $i > /dev/null
-done

.github/workflows/scripts/qemu-2-start.sh

@@ -1,233 +0,0 @@
-#!/usr/bin/env bash
-
-######################################################################
-# 2) start qemu with some operating system, init via cloud-init
-######################################################################
-
-set -eu
-
-# short name used in zfs-qemu.yml
-OS="$1"
-
-# OS variant (virt-install --os-variant list)
-OSv=$OS
-
-# compressed with .zst extension
-REPO="https://github.com/mcmilk/openzfs-freebsd-images"
-FREEBSD="$REPO/releases/download/v2024-12-14"
-URLzs=""
-
-# Ubuntu mirrors
-#UBMIRROR="https://cloud-images.ubuntu.com"
-#UBMIRROR="https://mirrors.cloud.tencent.com/ubuntu-cloud-images"
-UBMIRROR="https://mirror.citrahost.com/ubuntu-cloud-images"
-
-# default nic model for vm's
-NIC="virtio"
-
-case "$OS" in
-  almalinux8)
-    OSNAME="AlmaLinux 8"
-    URL="https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-latest.x86_64.qcow2"
-    ;;
-  almalinux9)
-    OSNAME="AlmaLinux 9"
-    URL="https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/AlmaLinux-9-GenericCloud-latest.x86_64.qcow2"
-    ;;
-  archlinux)
-    OSNAME="Archlinux"
-    URL="https://geo.mirror.pkgbuild.com/images/latest/Arch-Linux-x86_64-cloudimg.qcow2"
-    # dns sometimes fails with that url  :/
-    echo "89.187.191.12  geo.mirror.pkgbuild.com" | sudo tee /etc/hosts > /dev/null
-    ;;
-  centos-stream10)
-    OSNAME="CentOS Stream 10"
-    # TODO: #16903 Overwrite OSv to stream9 for virt-install until it's added to osinfo
-    OSv="centos-stream9"
-    URL="https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-10-latest.x86_64.qcow2"
-    ;;
-  centos-stream9)
-    OSNAME="CentOS Stream 9"
-    URL="https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
-    ;;
-  debian11)
-    OSNAME="Debian 11"
-    URL="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.qcow2"
-    ;;
-  debian12)
-    OSNAME="Debian 12"
-    URL="https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.qcow2"
-    ;;
-  fedora40)
-    OSNAME="Fedora 40"
-    OSv="fedora-unknown"
-    URL="https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/x86_64/images/Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2"
-    ;;
-  fedora41)
-    OSNAME="Fedora 41"
-    OSv="fedora-unknown"
-    URL="https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2"
-    ;;
-  fedora42)
-    OSNAME="Fedora 42"
-    OSv="fedora-unknown"
-    URL="https://download.fedoraproject.org/pub/fedora/linux/releases/42/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-42-1.1.x86_64.qcow2"
-    ;;
-  freebsd13-4r)
-    OSNAME="FreeBSD 13.4-RELEASE"
-    OSv="freebsd13.0"
-    URLzs="$FREEBSD/amd64-freebsd-13.4-RELEASE.qcow2.zst"
-    BASH="/usr/local/bin/bash"
-    NIC="rtl8139"
-    ;;
-  freebsd14-2r)
-    OSNAME="FreeBSD 14.2-RELEASE"
-    OSv="freebsd14.0"
-    URLzs="$FREEBSD/amd64-freebsd-14.2-RELEASE.qcow2.zst"
-    BASH="/usr/local/bin/bash"
-    ;;
-  freebsd13-4s)
-    OSNAME="FreeBSD 13.4-STABLE"
-    OSv="freebsd13.0"
-    URLzs="$FREEBSD/amd64-freebsd-13.4-STABLE.qcow2.zst"
-    BASH="/usr/local/bin/bash"
-    NIC="rtl8139"
-    ;;
-  freebsd14-2s)
-    OSNAME="FreeBSD 14.2-STABLE"
-    OSv="freebsd14.0"
-    URLzs="$FREEBSD/amd64-freebsd-14.2-STABLE.qcow2.zst"
-    BASH="/usr/local/bin/bash"
-    ;;
-  freebsd15-0c)
-    OSNAME="FreeBSD 15.0-CURRENT"
-    OSv="freebsd14.0"
-    URLzs="$FREEBSD/amd64-freebsd-15.0-CURRENT.qcow2.zst"
-    BASH="/usr/local/bin/bash"
-    ;;
-  tumbleweed)
-    OSNAME="openSUSE Tumbleweed"
-    OSv="opensusetumbleweed"
-    MIRROR="http://opensuse-mirror-gce-us.susecloud.net"
-    URL="$MIRROR/tumbleweed/appliances/openSUSE-MicroOS.x86_64-OpenStack-Cloud.qcow2"
-    ;;
-  ubuntu20)
-    OSNAME="Ubuntu 20.04"
-    OSv="ubuntu20.04"
-    URL="$UBMIRROR/focal/current/focal-server-cloudimg-amd64.img"
-    ;;
-  ubuntu22)
-    OSNAME="Ubuntu 22.04"
-    OSv="ubuntu22.04"
-    URL="$UBMIRROR/jammy/current/jammy-server-cloudimg-amd64.img"
-    ;;
-  ubuntu24)
-    OSNAME="Ubuntu 24.04"
-    OSv="ubuntu24.04"
-    URL="$UBMIRROR/noble/current/noble-server-cloudimg-amd64.img"
-    ;;
-  *)
-    echo "Wrong value for OS variable!"
-    exit 111
-    ;;
-esac
-
-# environment file
-ENV="/var/tmp/env.txt"
-echo "ENV=$ENV" >> $ENV
-
-# result path
-echo 'RESPATH="/var/tmp/test_results"' >> $ENV
-
-# FreeBSD 13 has problems with: e1000+virtio
-echo "NIC=$NIC" >> $ENV
-
-# freebsd15 -> used in zfs-qemu.yml
-echo "OS=$OS" >> $ENV
-
-# freebsd14.0 -> used for virt-install
-echo "OSv=\"$OSv\"" >> $ENV
-
-# FreeBSD 15 (Current) -> used for summary
-echo "OSNAME=\"$OSNAME\"" >> $ENV
-
-sudo mkdir -p "/mnt/tests"
-sudo chown -R $(whoami) /mnt/tests
-
-# we are downloading via axel, curl and wget are mostly slower and
-# require more return value checking
-IMG="/mnt/tests/cloudimg.qcow2"
-if [ ! -z "$URLzs" ]; then
-  echo "Loading image $URLzs ..."
-  time axel -q -o "$IMG.zst" "$URLzs"
-  zstd -q -d --rm "$IMG.zst"
-else
-  echo "Loading image $URL ..."
-  time axel -q -o "$IMG" "$URL"
-fi
-
-DISK="/dev/zvol/zpool/openzfs"
-FORMAT="raw"
-sudo zfs create -ps -b 64k -V 80g zpool/openzfs
-while true; do test -b $DISK && break; sleep 1; done
-echo "Importing VM image to zvol..."
-sudo qemu-img dd -f qcow2 -O raw if=$IMG of=$DISK bs=4M
-rm -f $IMG
-
-PUBKEY=$(cat ~/.ssh/id_ed25519.pub)
-cat <<EOF > /tmp/user-data
-#cloud-config
-
-fqdn: $OS
-
-users:
-- name: root
-  shell: $BASH
-- name: zfs
-  sudo: ALL=(ALL) NOPASSWD:ALL
-  shell: $BASH
-  ssh_authorized_keys:
-    - $PUBKEY
-
-growpart:
-  mode: auto
-  devices: ['/']
-  ignore_growroot_disabled: false
-EOF
-
-sudo virsh net-update default add ip-dhcp-host \
-  "<host mac='52:54:00:83:79:00' ip='192.168.122.10'/>" --live --config
-
-sudo virt-install \
-  --os-variant $OSv \
-  --name "openzfs" \
-  --cpu host-passthrough \
-  --virt-type=kvm --hvm \
-  --vcpus=4,sockets=1 \
-  --memory $((1024*12)) \
-  --memballoon model=virtio \
-  --graphics none \
-  --network bridge=virbr0,model=$NIC,mac='52:54:00:83:79:00' \
-  --cloud-init user-data=/tmp/user-data \
-  --disk $DISK,bus=virtio,cache=none,format=$FORMAT,driver.discard=unmap \
-  --import --noautoconsole >/dev/null
-
-# Give the VMs hostnames so we don't have to refer to them with
-# hardcoded IP addresses.
-#
-# vm0:          Initial VM we install dependencies and build ZFS on.
-# vm1..2        Testing VMs
-for i in {0..9} ; do
-  echo "192.168.122.1$i vm$i" | sudo tee -a /etc/hosts
-done
-
-# in case the directory isn't there already
-mkdir -p $HOME/.ssh
-
-cat <<EOF >> $HOME/.ssh/config
-# no questions please
-StrictHostKeyChecking no
-
-# small timeout, used in while loops later
-ConnectTimeout 1
-EOF

.github/workflows/scripts/qemu-3-deps-vm.sh

@@ -1,235 +0,0 @@
-#!/usr/bin/env bash
-
-######################################################################
-# 3) install dependencies for compiling and loading
-#
-# $1: OS name (like 'fedora41')
-######################################################################
-
-set -eu
-
-function archlinux() {
-  echo "##[group]Running pacman -Syu"
-  sudo btrfs filesystem resize max /
-  sudo pacman -Syu --noconfirm
-  echo "##[endgroup]"
-
-  echo "##[group]Install Development Tools"
-  sudo pacman -Sy --noconfirm base-devel bc cpio cryptsetup dhclient dkms \
-    fakeroot fio gdb inetutils jq less linux linux-headers lsscsi nfs-utils \
-    parted pax perf python-packaging python-setuptools qemu-guest-agent ksh \
-    samba sysstat rng-tools rsync wget xxhash
-  echo "##[endgroup]"
-}
-
-function debian() {
-  export DEBIAN_FRONTEND="noninteractive"
-
-  echo "##[group]Running apt-get update+upgrade"
-  sudo apt-get update -y
-  sudo apt-get upgrade -y
-  echo "##[endgroup]"
-
-  echo "##[group]Install Development Tools"
-  sudo apt-get install -y \
-    acl alien attr autoconf bc cpio cryptsetup curl dbench dh-python dkms \
-    fakeroot fio gdb gdebi git ksh lcov isc-dhcp-client jq libacl1-dev \
-    libaio-dev libattr1-dev libblkid-dev libcurl4-openssl-dev libdevmapper-dev \
-    libelf-dev libffi-dev libmount-dev libpam0g-dev libselinux-dev libssl-dev \
-    libtool libtool-bin libudev-dev libunwind-dev linux-headers-$(uname -r) \
-    lsscsi nfs-kernel-server pamtester parted python3 python3-all-dev \
-    python3-cffi python3-dev python3-distlib python3-packaging \
-    python3-setuptools python3-sphinx qemu-guest-agent rng-tools rpm2cpio \
-    rsync samba sysstat uuid-dev watchdog wget xfslibs-dev  xxhash zlib1g-dev
-  echo "##[endgroup]"
-}
-
-function freebsd() {
-  export ASSUME_ALWAYS_YES="YES"
-
-  echo "##[group]Install Development Tools"
-  sudo pkg install -y autoconf automake autotools base64 checkbashisms fio \
-    gdb gettext gettext-runtime git gmake gsed jq ksh93 lcov libtool lscpu \
-    pkgconf python python3 pamtester pamtester qemu-guest-agent rsync xxhash
-  sudo pkg install -xy \
-    '^samba4[[:digit:]]+$' \
-    '^py3[[:digit:]]+-cffi$' \
-    '^py3[[:digit:]]+-sysctl$' \
-    '^py3[[:digit:]]+-packaging$'
-  echo "##[endgroup]"
-}
-
-# common packages for: almalinux, centos, redhat
-function rhel() {
-  echo "##[group]Running dnf update"
-  echo "max_parallel_downloads=10" | sudo -E tee -a /etc/dnf/dnf.conf
-  sudo dnf clean all
-  sudo dnf update -y --setopt=fastestmirror=1 --refresh
-  echo "##[endgroup]"
-
-  echo "##[group]Install Development Tools"
-
-  # Alma wants "Development Tools", Fedora 41 wants "development-tools"
-  if ! sudo dnf group install -y "Development Tools" ; then
-    echo "Trying 'development-tools' instead of 'Development Tools'"
-    sudo dnf group install -y development-tools
-  fi
-
-  sudo dnf install -y \
-    acl attr bc bzip2 cryptsetup curl dbench dkms elfutils-libelf-devel fio \
-    gdb git jq kernel-rpm-macros ksh libacl-devel libaio-devel \
-    libargon2-devel libattr-devel libblkid-devel libcurl-devel libffi-devel \
-    ncompress libselinux-devel libtirpc-devel libtool libudev-devel \
-    libuuid-devel lsscsi mdadm nfs-utils openssl-devel pam-devel pamtester \
-    parted perf python3 python3-cffi python3-devel python3-packaging \
-    kernel-devel python3-setuptools qemu-guest-agent rng-tools rpcgen \
-    rpm-build rsync samba sysstat systemd watchdog wget xfsprogs-devel xxhash \
-    zlib-devel
-  echo "##[endgroup]"
-}
-
-function tumbleweed() {
-  echo "##[group]Running zypper is TODO!"
-  sleep 23456
-  echo "##[endgroup]"
-}
-
-# Install dependencies
-case "$1" in
-  almalinux8)
-    echo "##[group]Enable epel and powertools repositories"
-    sudo dnf config-manager -y --set-enabled powertools
-    sudo dnf install -y epel-release
-    echo "##[endgroup]"
-    rhel
-    echo "##[group]Install kernel-abi-whitelists"
-    sudo dnf install -y kernel-abi-whitelists
-    echo "##[endgroup]"
-    ;;
-  almalinux9|centos-stream9|centos-stream10)
-    echo "##[group]Enable epel and crb repositories"
-    sudo dnf config-manager -y --set-enabled crb
-    sudo dnf install -y epel-release
-    echo "##[endgroup]"
-    rhel
-    echo "##[group]Install kernel-abi-stablelists"
-    sudo dnf install -y kernel-abi-stablelists
-    echo "##[endgroup]"
-    ;;
-  archlinux)
-    archlinux
-    ;;
-  debian*)
-    echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
-    debian
-    echo "##[group]Install Debian specific"
-    sudo apt-get install -yq linux-perf dh-sequence-dkms
-    echo "##[endgroup]"
-    ;;
-  fedora*)
-    rhel
-    sudo dnf install -y libunwind-devel
-
-    # Fedora 42+ moves /usr/bin/script from 'util-linux' to 'util-linux-script'
-    sudo dnf install -y util-linux-script || true
-    ;;
-  freebsd*)
-    freebsd
-    ;;
-  tumbleweed)
-    tumbleweed
-    ;;
-  ubuntu*)
-    debian
-    echo "##[group]Install Ubuntu specific"
-    sudo apt-get install -yq linux-tools-common libtirpc-dev \
-      linux-modules-extra-$(uname -r)
-    if [ "$1" != "ubuntu20" ]; then
-      sudo apt-get install -yq dh-sequence-dkms
-    fi
-    echo "##[endgroup]"
-    echo "##[group]Delete Ubuntu OpenZFS modules"
-    for i in $(find /lib/modules -name zfs -type d); do sudo rm -rvf $i; done
-    echo "##[endgroup]"
-    ;;
-esac
-
-# This script is used for checkstyle + zloop deps also.
-# Install only the needed packages and exit - when used this way.
-test -z "${ONLY_DEPS:-}" || exit 0
-
-# Start services
-echo "##[group]Enable services"
-case "$1" in
-  freebsd*)
-    # add virtio things
-    echo 'virtio_load="YES"' | sudo -E tee -a /boot/loader.conf
-    for i in balloon blk console random scsi; do
-      echo "virtio_${i}_load=\"YES\"" | sudo -E tee -a /boot/loader.conf
-    done
-    echo "fdescfs /dev/fd fdescfs rw 0 0" | sudo -E tee -a /etc/fstab
-    sudo -E mount /dev/fd
-    sudo -E touch /etc/zfs/exports
-    sudo -E sysrc mountd_flags="/etc/zfs/exports"
-    echo '[global]' | sudo -E tee /usr/local/etc/smb4.conf >/dev/null
-    sudo -E service nfsd enable
-    sudo -E service qemu-guest-agent enable
-    sudo -E service samba_server enable
-    ;;
-  debian*|ubuntu*)
-    sudo -E systemctl enable nfs-kernel-server
-    sudo -E systemctl enable qemu-guest-agent
-    sudo -E systemctl enable smbd
-    ;;
-  *)
-    # All other linux distros
-    sudo -E systemctl enable nfs-server
-    sudo -E systemctl enable qemu-guest-agent
-    sudo -E systemctl enable smb
-    ;;
-esac
-echo "##[endgroup]"
-
-# Setup Kernel cmdline
-CMDLINE="console=tty0 console=ttyS0,115200n8"
-CMDLINE="$CMDLINE selinux=0"
-CMDLINE="$CMDLINE random.trust_cpu=on"
-CMDLINE="$CMDLINE no_timer_check"
-case "$1" in
-  almalinux*|centos*|fedora*)
-    GRUB_CFG="/boot/grub2/grub.cfg"
-    GRUB_MKCONFIG="grub2-mkconfig"
-    CMDLINE="$CMDLINE biosdevname=0 net.ifnames=0"
-    echo 'GRUB_SERIAL_COMMAND="serial --speed=115200"' \
-      | sudo tee -a /etc/default/grub >/dev/null
-    ;;
-  ubuntu24)
-    GRUB_CFG="/boot/grub/grub.cfg"
-    GRUB_MKCONFIG="grub-mkconfig"
-    echo 'GRUB_DISABLE_OS_PROBER="false"' \
-      | sudo tee -a /etc/default/grub >/dev/null
-    ;;
-  *)
-    GRUB_CFG="/boot/grub/grub.cfg"
-    GRUB_MKCONFIG="grub-mkconfig"
-    ;;
-esac
-
-case "$1" in
-  archlinux|freebsd*)
-    true
-    ;;
-  *)
-    echo "##[group]Edit kernel cmdline"
-    sudo sed -i -e '/^GRUB_CMDLINE_LINUX/d' /etc/default/grub || true
-    echo "GRUB_CMDLINE_LINUX=\"$CMDLINE\"" \
-      | sudo tee -a /etc/default/grub >/dev/null
-    sudo $GRUB_MKCONFIG -o $GRUB_CFG
-    echo "##[endgroup]"
-    ;;
-esac
-
-# reset cloud-init configuration and poweroff
-sudo cloud-init clean --logs
-sleep 2 && sudo poweroff &
-exit 0

.github/workflows/scripts/qemu-3-deps.sh

@@ -1,15 +0,0 @@
-######################################################################
-# 3) Wait for VM to boot from previous step and launch dependencies
-#    script on it.
-#
-# $1: OS name (like 'fedora41')
-######################################################################
-
-.github/workflows/scripts/qemu-wait-for-vm.sh vm0
-scp .github/workflows/scripts/qemu-3-deps-vm.sh zfs@vm0:qemu-3-deps-vm.sh
-PID=`pidof /usr/bin/qemu-system-x86_64`
-ssh zfs@vm0 '$HOME/qemu-3-deps-vm.sh' $1
-# wait for poweroff to succeed
-tail --pid=$PID -f /dev/null
-sleep 5 # avoid this: "error: Domain is already active"
-rm -f $HOME/.ssh/known_hosts

.github/workflows/scripts/qemu-4-build-vm.sh

@@ -1,379 +0,0 @@
-#!/usr/bin/env bash
-
-######################################################################
-# 4) configure and build openzfs modules.  This is run on the VMs.
-#
-# Usage:
-#
-#       qemu-4-build-vm.sh OS [--enable-debug][--dkms][--poweroff]
-#           [--release][--repo][--tarball]
-#
-# OS:           OS name like 'fedora41'
-# --enable-debug:  Build RPMs with '--enable-debug' (for testing)
-# --dkms:       Build DKMS RPMs as well
-# --poweroff:   Power-off the VM after building
-# --release     Build zfs-release*.rpm as well
-# --repo        After building everything, copy RPMs into /tmp/repo
-#               in the ZFS RPM repository file structure.  Also
-#               copy tarballs if they were built.
-# --tarball:    Also build a tarball of ZFS source
-######################################################################
-
-ENABLE_DEBUG=""
-DKMS=""
-POWEROFF=""
-RELEASE=""
-REPO=""
-TARBALL=""
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    --enable-debug)
-      ENABLE_DEBUG=1
-      shift
-      ;;
-    --dkms)
-      DKMS=1
-      shift
-      ;;
-    --poweroff)
-      POWEROFF=1
-      shift
-      ;;
-    --release)
-      RELEASE=1
-      shift
-      ;;
-    --repo)
-      REPO=1
-      shift
-      ;;
-    --tarball)
-      TARBALL=1
-      shift
-      ;;
-    *)
-      OS=$1
-      shift
-      ;;
-  esac
-done
-
-set -eu
-
-function run() {
-  LOG="/var/tmp/build-stderr.txt"
-  echo "****************************************************"
-  echo "$(date) ($*)"
-  echo "****************************************************"
-  ($@ || echo $? > /tmp/rv) 3>&1 1>&2 2>&3 | stdbuf -eL -oL tee -a $LOG
-  if [ -f /tmp/rv ]; then
-    RV=$(cat /tmp/rv)
-    echo "****************************************************"
-    echo "exit with value=$RV ($*)"
-    echo "****************************************************"
-    echo 1 > /var/tmp/build-exitcode.txt
-    exit $RV
-  fi
-}
-
-# Look at the RPMs in the current directory and copy/move them to
-# /tmp/repo, using the directory structure we use for the ZFS RPM repos.
-#
-# For example:
-# /tmp/repo/epel-testing/9.5
-# /tmp/repo/epel-testing/9.5/SRPMS
-# /tmp/repo/epel-testing/9.5/SRPMS/zfs-2.3.99-1.el9.src.rpm
-# /tmp/repo/epel-testing/9.5/SRPMS/zfs-kmod-2.3.99-1.el9.src.rpm
-# /tmp/repo/epel-testing/9.5/kmod
-# /tmp/repo/epel-testing/9.5/kmod/x86_64
-# /tmp/repo/epel-testing/9.5/kmod/x86_64/debug
-# /tmp/repo/epel-testing/9.5/kmod/x86_64/debug/kmod-zfs-debuginfo-2.3.99-1.el9.x86_64.rpm
-# /tmp/repo/epel-testing/9.5/kmod/x86_64/debug/libnvpair3-debuginfo-2.3.99-1.el9.x86_64.rpm
-# /tmp/repo/epel-testing/9.5/kmod/x86_64/debug/libuutil3-debuginfo-2.3.99-1.el9.x86_64.rpm
-# ...
-function copy_rpms_to_repo {
-  # Pick a RPM to query. It doesn't matter which one - we just want to extract
-  # the 'Build Host' value from it.
-  rpm=$(ls zfs-*.rpm | head -n 1)
-
-  # Get zfs version '2.2.99'
-  zfs_ver=$(rpm -qpi $rpm | awk '/Version/{print $3}')
-
-  # Get "2.1" or "2.2"
-  zfs_major=$(echo $zfs_ver | grep -Eo [0-9]+\.[0-9]+)
-
-  # Get 'almalinux9.5' or 'fedora41' type string
-  build_host=$(rpm -qpi $rpm | awk '/Build Host/{print $4}')
-
-  # Get '9.5' or '41' OS version
-  os_ver=$(echo $build_host | grep -Eo '[0-9\.]+$')
-
-  # Our ZFS version and OS name will determine which repo the RPMs
-  # will go in (regular or testing).  Fedora always gets the newest
-  # releases, and Alma gets the older releases.
-  case $build_host in
-  almalinux*)
-    case $zfs_major in
-    2.2)
-      d="epel"
-      ;;
-    *)
-      d="epel-testing"
-      ;;
-    esac
-    ;;
-  fedora*)
-    d="fedora"
-    ;;
-  esac
-
-  prefix=/tmp/repo
-  dst="$prefix/$d/$os_ver"
-
-  # Special case: move zfs-release*.rpm out of the way first (if we built them).
-  # This will make filtering the other RPMs easier.
-  mkdir -p $dst
-  mv zfs-release*.rpm $dst || true
-
-  # Copy source RPMs
-  mkdir -p $dst/SRPMS
-  cp $(ls *.src.rpm) $dst/SRPMS/
-
-  if [[ "$build_host" =~ "almalinux" ]] ; then
-    # Copy kmods+userspace
-    mkdir -p $dst/kmod/x86_64/debug
-    cp $(ls *.rpm | grep -Ev 'src.rpm|dkms|debuginfo') $dst/kmod/x86_64
-    cp *debuginfo*.rpm $dst/kmod/x86_64/debug
-  fi
-
-  if [ -n "$DKMS" ] ; then
-    # Copy dkms+userspace
-    mkdir -p $dst/x86_64
-    cp $(ls *.rpm | grep -Ev 'src.rpm|kmod|debuginfo') $dst/x86_64
-  fi
-
-  # Copy debug
-  mkdir -p $dst/x86_64/debug
-  cp $(ls *debuginfo*.rpm | grep -v kmod) $dst/x86_64/debug
-}
-
-function freebsd() {
-  extra="${1:-}"
-
-  export MAKE="gmake"
-  echo "##[group]Autogen.sh"
-  run ./autogen.sh
-  echo "##[endgroup]"
-
-  echo "##[group]Configure"
-  run ./configure \
-    --prefix=/usr/local \
-    --with-libintl-prefix=/usr/local \
-    --enable-pyzfs \
-    --enable-debuginfo $extra
-  echo "##[endgroup]"
-
-  echo "##[group]Build"
-  run gmake -j$(sysctl -n hw.ncpu)
-  echo "##[endgroup]"
-
-  echo "##[group]Install"
-  run sudo gmake install
-  echo "##[endgroup]"
-}
-
-function linux() {
-  extra="${1:-}"
-
-  echo "##[group]Autogen.sh"
-  run ./autogen.sh
-  echo "##[endgroup]"
-
-  echo "##[group]Configure"
-  run ./configure \
-    --prefix=/usr \
-    --enable-pyzfs \
-    --enable-debuginfo $extra
-  echo "##[endgroup]"
-
-  echo "##[group]Build"
-  run make -j$(nproc)
-  echo "##[endgroup]"
-
-  echo "##[group]Install"
-  run sudo make install
-  echo "##[endgroup]"
-}
-
-function rpm_build_and_install() {
-  extra="${1:-}"
-
-  # Build RPMs with XZ compression by default (since gzip decompression is slow)
-  echo "%_binary_payload w7.xzdio" >> ~/.rpmmacros
-
-  echo "##[group]Autogen.sh"
-  run ./autogen.sh
-  echo "##[endgroup]"
-
-  echo "##[group]Configure"
-  run ./configure --enable-debuginfo $extra
-  echo "##[endgroup]"
-
-  echo "##[group]Build"
-  run make pkg-kmod pkg-utils
-  echo "##[endgroup]"
-
-  if [ -n "$DKMS" ] ; then
-    echo "##[group]DKMS"
-    make rpm-dkms
-    echo "##[endgroup]"
-  fi
-
-  if [ -n "$REPO" ] ; then
-    echo "Skipping install since we're only building RPMs and nothing else"
-  else
-    echo "##[group]Install"
-    run sudo dnf -y --nobest install $(ls *.rpm | grep -Ev 'dkms|src.rpm')
-    echo "##[endgroup]"
-  fi
-
-  # Optionally build the zfs-release.*.rpm
-  if [ -n "$RELEASE" ] ; then
-    echo "##[group]Release"
-    pushd ~
-    sudo dnf -y install rpm-build || true
-    # Check out a sparse copy of zfsonlinux.github.com.git so we don't get
-    # all the binaries.  We just need a few kilobytes of files to build RPMs.
-    git clone --depth 1 --no-checkout \
-      https://github.com/zfsonlinux/zfsonlinux.github.com.git
-
-    cd zfsonlinux.github.com
-    git sparse-checkout set zfs-release
-    git checkout
-    cd zfs-release
-
-    mkdir -p ~/rpmbuild/{BUILDROOT,SPECS,RPMS,SRPMS,SOURCES,BUILD}
-    cp RPM-GPG-KEY-openzfs* *.repo ~/rpmbuild/SOURCES
-    cp zfs-release.spec ~/rpmbuild/SPECS/
-    rpmbuild -ba ~/rpmbuild/SPECS/zfs-release.spec
-
-    # ZFS release RPMs are built.  Copy them to the ~/zfs directory just to
-    # keep all the RPMs in the same place.
-    cp ~/rpmbuild/RPMS/noarch/*.rpm ~/zfs
-    cp ~/rpmbuild/SRPMS/*.rpm ~/zfs
-
-    popd
-    rm -fr ~/rpmbuild
-    echo "##[endgroup]"
-  fi
-
-  if [ -n "$REPO" ] ; then
-    echo "##[group]Repo"
-    copy_rpms_to_repo
-    echo "##[endgroup]"
-  fi
-}
-
-function deb_build_and_install() {
-  extra="${1:-}"
-
-  echo "##[group]Autogen.sh"
-  run ./autogen.sh
-  echo "##[endgroup]"
-
-  echo "##[group]Configure"
-  run ./configure \
-    --prefix=/usr \
-    --enable-pyzfs \
-    --enable-debuginfo $extra
-  echo "##[endgroup]"
-
-  echo "##[group]Build"
-  run make native-deb-kmod native-deb-utils
-  echo "##[endgroup]"
-
-  echo "##[group]Install"
-  # Do kmod install.  Note that when you build the native debs, the
-  # packages themselves are placed in parent directory '../' rather than
-  # in the source directory like the rpms are.
-  run sudo apt-get -y install $(find ../ | grep -E '\.deb$' \
-    | grep -Ev 'dkms|dracut')
-  echo "##[endgroup]"
-}
-
-function build_tarball {
-  if [ -n "$REPO" ] ; then
-    ./autogen.sh
-    ./configure --with-config=srpm
-    make dist
-    mkdir -p /tmp/repo/releases
-    # The tarball name is based off of 'Version' field in the META file.
-    mv *.tar.gz /tmp/repo/releases/
-  fi
-}
-
-# Debug: show kernel cmdline
-if [ -f /proc/cmdline ] ; then
-  cat /proc/cmdline || true
-fi
-
-# Set our hostname to our OS name and version number.  Specifically, we set the
-# major and minor number so that when we query the Build Host field in the RPMs
-# we build, we can see what specific version of Fedora/Almalinux we were using
-# to build them.  This is helpful for matching up KMOD versions.
-#
-# Examples:
-#
-# rhel8.10
-# almalinux9.5
-# fedora40
-source /etc/os-release
-sudo hostname "$ID$VERSION_ID"
-
-# save some sysinfo
-uname -a > /var/tmp/uname.txt
-
-cd $HOME/zfs
-export PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin"
-
-extra=""
-if [ -n "$ENABLE_DEBUG" ] ; then
-  extra="--enable-debug"
-fi
-
-# build
-case "$OS" in
-  freebsd*)
-    freebsd "$extra"
-    ;;
-  alma*|centos*)
-    rpm_build_and_install "--with-spec=redhat $extra"
-    ;;
-  fedora*)
-    rpm_build_and_install "$extra"
-
-    # Historically, we've always built the release tarballs on Fedora, since
-    # there was one instance long ago where we built them on CentOS 7, and they
-    # didn't work correctly for everyone.
-    if [ -n "$TARBALL" ] ; then
-        build_tarball
-    fi
-    ;;
-  debian*|ubuntu*)
-    deb_build_and_install "$extra"
-    ;;
-  *)
-    linux "$extra"
-    ;;
-esac
-
-
-# building the zfs module was ok
-echo 0 > /var/tmp/build-exitcode.txt
-
-# reset cloud-init configuration and poweroff
-if [ -n "$POWEROFF" ] ; then
-        sudo cloud-init clean --logs
-        sync && sleep 2 && sudo poweroff &
-fi
-exit 0

.github/workflows/scripts/qemu-4-build.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-######################################################################
-# 4) configure and build openzfs modules
-######################################################################
-echo "Build modules in QEMU machine"
-
-# Bring our VM back up and copy over ZFS source
-.github/workflows/scripts/qemu-prepare-for-build.sh
-
-ssh zfs@vm0 '$HOME/zfs/.github/workflows/scripts/qemu-4-build-vm.sh' $@

.github/workflows/scripts/qemu-5-setup.sh

@@ -1,124 +0,0 @@
-#!/usr/bin/env bash
-
-######################################################################
-# 5) start test machines and load openzfs module
-######################################################################
-
-set -eu
-
-# read our defined variables
-source /var/tmp/env.txt
-
-# wait for poweroff to succeed
-PID=$(pidof /usr/bin/qemu-system-x86_64)
-tail --pid=$PID -f /dev/null
-sudo virsh undefine openzfs
-
-# default values per test vm:
-VMs=2
-CPU=2
-
-# cpu pinning
-CPUSET=("0,1" "2,3")
-
-case "$OS" in
-  freebsd*)
-    # FreeBSD can't be optimized via ksmtuned
-    RAM=6
-    ;;
-  *)
-    # Linux can be optimized via ksmtuned
-    RAM=8
-    ;;
-esac
-
-# this can be different for each distro
-echo "VMs=$VMs" >> $ENV
-
-# create snapshot we can clone later
-sudo zfs snapshot zpool/openzfs@now
-
-# setup the testing vm's
-PUBKEY=$(cat ~/.ssh/id_ed25519.pub)
-for i in $(seq 1 $VMs); do
-
-  echo "Creating disk for vm$i..."
-  DISK="/dev/zvol/zpool/vm$i"
-  FORMAT="raw"
-  sudo zfs clone zpool/openzfs@now zpool/vm$i
-  sudo zfs create -ps -b 64k -V 80g zpool/vm$i-2
-
-  cat <<EOF > /tmp/user-data
-#cloud-config
-
-fqdn: vm$i
-
-users:
-- name: root
-  shell: $BASH
-- name: zfs
-  sudo: ALL=(ALL) NOPASSWD:ALL
-  shell: $BASH
-  ssh_authorized_keys:
-    - $PUBKEY
-
-growpart:
-  mode: auto
-  devices: ['/']
-  ignore_growroot_disabled: false
-EOF
-
-  sudo virsh net-update default add ip-dhcp-host \
-    "<host mac='52:54:00:83:79:0$i' ip='192.168.122.1$i'/>" --live --config
-
-  sudo virt-install \
-    --os-variant $OSv \
-    --name "vm$i" \
-    --cpu host-passthrough \
-    --virt-type=kvm --hvm \
-    --vcpus=$CPU,sockets=1 \
-    --cpuset=${CPUSET[$((i-1))]} \
-    --memory $((1024*RAM)) \
-    --memballoon model=virtio \
-    --graphics none \
-    --cloud-init user-data=/tmp/user-data \
-    --network bridge=virbr0,model=$NIC,mac="52:54:00:83:79:0$i" \
-    --disk $DISK,bus=virtio,cache=none,format=$FORMAT,driver.discard=unmap \
-    --disk $DISK-2,bus=virtio,cache=none,format=$FORMAT,driver.discard=unmap \
-    --import --noautoconsole >/dev/null
-done
-
-# check the memory state from time to time
-cat <<EOF > cronjob.sh
-# $OS
-exec 1>>/var/tmp/stats.txt
-exec 2>&1
-echo "*******************************************************"
-date
-uptime
-free -m
-df -h /mnt/tests
-zfs list
-EOF
-sudo chmod +x cronjob.sh
-sudo mv -f cronjob.sh /root/cronjob.sh
-echo '*/5 * * * *  /root/cronjob.sh' > crontab.txt
-sudo crontab crontab.txt
-rm crontab.txt
-
-# check if the machines are okay
-echo "Waiting for vm's to come up...  (${VMs}x CPU=$CPU RAM=$RAM)"
-for i in $(seq 1 $VMs); do
-  .github/workflows/scripts/qemu-wait-for-vm.sh vm$i
-done
-echo "All $VMs VMs are up now."
-
-# Save the VM's serial output (ttyS0) to /var/tmp/console.txt
-# - ttyS0 on the VM corresponds to a local /dev/pty/N entry
-# - use 'virsh ttyconsole' to lookup the /dev/pty/N entry
-for i in $(seq 1 $VMs); do
-  mkdir -p $RESPATH/vm$i
-  read "pty" <<< $(sudo virsh ttyconsole vm$i)
-  sudo nohup bash -c "cat $pty > $RESPATH/vm$i/console.txt" &
-done
-echo "Console logging for ${VMs}x $OS started."

.github/workflows/scripts/qemu-6-tests.sh

@@ -1,105 +0,0 @@
-#!/usr/bin/env bash
-
-######################################################################
-# 6) load openzfs module and run the tests
-#
-# called on runner:  qemu-6-tests.sh
-# called on qemu-vm: qemu-6-tests.sh $OS $2/$3
-######################################################################
-
-set -eu
-
-function prefix() {
-  ID="$1"
-  LINE="$2"
-  CURRENT=$(date +%s)
-  TSSTART=$(cat /tmp/tsstart)
-  DIFF=$((CURRENT-TSSTART))
-  H=$((DIFF/3600))
-  DIFF=$((DIFF-(H*3600)))
-  M=$((DIFF/60))
-  S=$((DIFF-(M*60)))
-
-  CTR=$(cat /tmp/ctr)
-  echo $LINE| grep -q "^Test[: ]" && CTR=$((CTR+1)) && echo $CTR > /tmp/ctr
-
-  BASE="$HOME/work/zfs/zfs"
-  COLOR="$BASE/scripts/zfs-tests-color.sh"
-  CLINE=$(echo $LINE| grep "^Test[ :]" | sed -e 's|/usr/local|/usr|g' \
-    | sed -e 's| /usr/share/zfs/zfs-tests/tests/| |g' | $COLOR)
-  if [ -z "$CLINE" ]; then
-    printf "vm${ID}: %s\n" "$LINE"
-  else
-    # [vm2: 00:15:54  256] Test: functional/checksum/setup (run as root) [00:00] [PASS]
-    printf "[vm${ID}: %02d:%02d:%02d %4d] %s\n" \
-      "$H" "$M" "$S" "$CTR" "$CLINE"
-  fi
-}
-
-# called directly on the runner
-if [ -z ${1:-} ]; then
-  cd "/var/tmp"
-  source env.txt
-  SSH=$(which ssh)
-  TESTS='$HOME/zfs/.github/workflows/scripts/qemu-6-tests.sh'
-  echo 0 > /tmp/ctr
-  date "+%s" > /tmp/tsstart
-
-  for i in $(seq 1 $VMs); do
-    IP="192.168.122.1$i"
-    daemonize -c /var/tmp -p vm${i}.pid -o vm${i}log.txt -- \
-      $SSH zfs@$IP $TESTS $OS $i $VMs $CI_TYPE
-    # handly line by line and add info prefix
-    stdbuf -oL tail -fq vm${i}log.txt \
-      | while read -r line; do prefix "$i" "$line"; done &
-    echo $! > vm${i}log.pid
-    # don't mix up the initial --- Configuration --- part
-    sleep 0.13
-  done
-
-  # wait for all vm's to finish
-  for i in $(seq 1 $VMs); do
-    tail --pid=$(cat vm${i}.pid) -f /dev/null
-    pid=$(cat vm${i}log.pid)
-    rm -f vm${i}log.pid
-    kill $pid
-  done
-
-  exit 0
-fi
-
-# this part runs inside qemu vm
-export PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
-case "$1" in
-  freebsd*)
-    sudo kldstat -n zfs 2>/dev/null && sudo kldunload zfs
-    sudo -E ./zfs/scripts/zfs.sh
-    TDIR="/usr/local/share/zfs"
-    ;;
-  *)
-    # use xfs @ /var/tmp for all distros
-    sudo mv -f /var/tmp/*.txt /tmp
-    sudo mkfs.xfs -fq /dev/vdb
-    sudo mount -o noatime /dev/vdb /var/tmp
-    sudo chmod 1777 /var/tmp
-    sudo mv -f /tmp/*.txt /var/tmp
-    sudo -E modprobe zfs
-    TDIR="/usr/share/zfs"
-    ;;
-esac
-
-# run functional testings and save exitcode
-cd /var/tmp
-TAGS=$2/$3
-if [ "$4" == "quick" ]; then
-  export RUNFILES="sanity.run"
-fi
-sudo dmesg -c > dmesg-prerun.txt
-mount > mount.txt
-df -h > df-prerun.txt
-$TDIR/zfs-tests.sh -vK -s 3GB -T $TAGS
-RV=$?
-df -h > df-postrun.txt
-echo $RV > tests-exitcode.txt
-sync
-exit 0

.github/workflows/scripts/qemu-7-prepare.sh

@@ -1,124 +0,0 @@
-#!/usr/bin/env bash
-
-######################################################################
-# 7) prepare output of the results
-# - this script pre-creates all needed logfiles for later summary
-######################################################################
-
-set -eu
-
-# read our defined variables
-cd /var/tmp
-source env.txt
-
-mkdir -p $RESPATH
-
-# check if building the module has failed
-if [ -z ${VMs:-} ]; then
-  cd $RESPATH
-  echo ":exclamation: ZFS module didn't build successfully :exclamation:" \
-    | tee summary.txt | tee /tmp/summary.txt
-  cp /var/tmp/*.txt .
-  tar cf /tmp/qemu-$OS.tar -C $RESPATH -h . || true
-  exit 0
-fi
-
-# build was okay
-BASE="$HOME/work/zfs/zfs"
-MERGE="$BASE/.github/workflows/scripts/merge_summary.awk"
-
-# catch result files of testings (vm's should be there)
-for i in $(seq 1 $VMs); do
-  rsync -arL zfs@vm$i:$RESPATH/current $RESPATH/vm$i || true
-  scp zfs@vm$i:"/var/tmp/*.txt" $RESPATH/vm$i || true
-  scp zfs@vm$i:"/var/tmp/*.rpm" $RESPATH/vm$i || true
-done
-cp -f /var/tmp/*.txt $RESPATH || true
-cd $RESPATH
-
-# prepare result files for summary
-for i in $(seq 1 $VMs); do
-  file="vm$i/build-stderr.txt"
-  test -s $file && mv -f $file build-stderr.txt
-
-  file="vm$i/build-exitcode.txt"
-  test -s $file && mv -f $file build-exitcode.txt
-
-  file="vm$i/uname.txt"
-  test -s $file && mv -f $file uname.txt
-
-  file="vm$i/tests-exitcode.txt"
-  if [ ! -s $file ]; then
-    # XXX - add some tests for kernel panic's here
-    # tail -n 80 vm$i/console.txt | grep XYZ
-    echo 1 > $file
-  fi
-  rv=$(cat vm$i/tests-exitcode.txt)
-  test $rv != 0 && touch /tmp/have_failed_tests
-
-  file="vm$i/current/log"
-  if [ -s $file ]; then
-    cat $file >> log
-    awk '/\[FAIL\]|\[KILLED\]/{ show=1; print; next; }; \
-      /\[SKIP\]|\[PASS\]/{ show=0; } show' \
-      $file > /tmp/vm${i}dbg.txt
-  fi
-
-  file="vm${i}log.txt"
-  fileC="/tmp/vm${i}log.txt"
-  if [ -s $file ]; then
-    cat $file >> summary
-    cat $file | $BASE/scripts/zfs-tests-color.sh > $fileC
-  fi
-done
-
-# create summary of tests
-if [ -s summary ]; then
-  $MERGE summary | grep -v '^/' > summary.txt
-  $MERGE summary | $BASE/scripts/zfs-tests-color.sh > /tmp/summary.txt
-  rm -f summary
-else
-  touch summary.txt /tmp/summary.txt
-fi
-
-# create file for debugging
-if [ -s log ]; then
-  awk '/\[FAIL\]|\[KILLED\]/{ show=1; print; next; }; \
-    /\[SKIP\]|\[PASS\]/{ show=0; } show' \
-    log > summary-failure-logs.txt
-  rm -f log
-else
-  touch summary-failure-logs.txt
-fi
-
-# create debug overview for failed tests
-cat summary.txt \
-  | awk '/\(expected PASS\)/{ if ($1!="SKIP") print $2; next; } show' \
-  | while read t; do
-  cat summary-failure-logs.txt \
-    | awk '$0~/Test[: ]/{ show=0; } $0~v{ show=1; } show' v="$t" \
-    > /tmp/fail.txt
-  SIZE=$(stat --printf="%s" /tmp/fail.txt)
-  SIZE=$((SIZE/1024))
-  # Test Summary:
-  echo "##[group]$t ($SIZE KiB)" >> /tmp/failed.txt
-  cat /tmp/fail.txt | $BASE/scripts/zfs-tests-color.sh >> /tmp/failed.txt
-  echo "##[endgroup]" >> /tmp/failed.txt
-  # Job Summary:
-  echo -e "\n<details>\n<summary>$t ($SIZE KiB)</summary><pre>" >> failed.txt
-  cat /tmp/fail.txt >> failed.txt
-  echo "</pre></details>" >> failed.txt
-done
-
-if [ -e /tmp/have_failed_tests ]; then
-  echo ":warning: Some tests failed!" >> failed.txt
-else
-  echo ":thumbsup: All tests passed." >> failed.txt
-fi
-
-if [ ! -s uname.txt ]; then
-  echo ":interrobang: Panic - where is my uname.txt?" > uname.txt
-fi
-
-# artifact ready now
-tar cf /tmp/qemu-$OS.tar -C $RESPATH -h . || true

.github/workflows/scripts/qemu-8-summary.sh

@@ -1,71 +0,0 @@
-#!/usr/bin/env bash
-
-######################################################################
-# 8) show colored output of results
-######################################################################
-
-set -eu
-
-# read our defined variables
-source /var/tmp/env.txt
-cd $RESPATH
-
-# helper function for showing some content with headline
-function showfile() {
-  content=$(dd if=$1 bs=1024 count=400k 2>/dev/null)
-  if [ -z "$2" ]; then
-    group1=""
-    group2=""
-  else
-    SIZE=$(stat --printf="%s" "$file")
-    SIZE=$((SIZE/1024))
-    group1="##[group]$2 ($SIZE KiB)"
-    group2="##[endgroup]"
-  fi
-cat <<EOF > tmp$$
-$group1
-$content
-$group2
-EOF
-  cat tmp$$
-  rm -f tmp$$
-}
-
-# overview
-cat /tmp/summary.txt
-echo ""
-
-if [ -f /tmp/have_failed_tests -a -s /tmp/failed.txt ]; then
-  echo "Debuginfo of failed tests:"
-  cat /tmp/failed.txt
-  echo ""
-  cat /tmp/summary.txt | grep -v '^/'
-  echo ""
-fi
-
-echo -e "\nFull logs for download:\n    $1\n"
-
-for i in $(seq 1 $VMs); do
-  rv=$(cat vm$i/tests-exitcode.txt)
-
-  if [ $rv = 0 ]; then
-    vm="vm$i"
-  else
-    vm="vm$i"
-  fi
-
-  file="vm$i/dmesg-prerun.txt"
-  test -s "$file" && showfile "$file" "$vm: dmesg kernel"
-
-  file="/tmp/vm${i}log.txt"
-  test -s "$file" && showfile "$file" "$vm: test results"
-
-  file="vm$i/console.txt"
-  test -s "$file" && showfile "$file" "$vm: serial console"
-
-  file="/tmp/vm${i}dbg.txt"
-  test -s "$file" && showfile "$file" "$vm: failure logfile"
-done
-
-test -f /tmp/have_failed_tests && exit 1
-exit 0

.github/workflows/scripts/qemu-9-summary-page.sh

@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-
-######################################################################
-# 9) generate github summary page of all the testings
-######################################################################
-
-set -eu
-
-function output() {
-  echo -e $* >> "out-$logfile.md"
-}
-
-function outfile() {
-  cat "$1" >> "out-$logfile.md"
-}
-
-function outfile_plain() {
-  output "<pre>"
-  cat "$1" >> "out-$logfile.md"
-  output "</pre>"
-}
-
-function send2github() {
-  test -f "$1" || exit 0
-  dd if="$1" bs=1023k count=1 >> $GITHUB_STEP_SUMMARY
-}
-
-# https://docs.github.com/en/enterprise-server@3.6/actions/using-workflows/workflow-commands-for-github-actions#step-isolation-and-limits
-# Job summaries are isolated between steps and each step is restricted to a maximum size of 1MiB.
-# [ ] can not show all error findings here
-# [x] split files into smaller ones and create additional steps
-
-# first call, generate all summaries
-if [ ! -f out-1.md ]; then
-  logfile="1"
-  for tarfile in Logs-functional-*/qemu-*.tar; do
-    rm -rf vm* *.txt
-    if [ ! -s "$tarfile" ]; then
-      output "\n## Functional Tests: unknown\n"
-      output ":exclamation: Tarfile $tarfile is empty :exclamation:"
-      continue
-    fi
-    tar xf "$tarfile"
-    test -s env.txt || continue
-    source env.txt
-    # when uname.txt is there, the other files are also ok
-    test -s uname.txt || continue
-    output "\n## Functional Tests: $OSNAME\n"
-    outfile_plain uname.txt
-    outfile_plain summary.txt
-    outfile failed.txt
-    logfile=$((logfile+1))
-  done
-  send2github out-1.md
-else
-  send2github out-$1.md
-fi

.github/workflows/scripts/qemu-prepare-for-build.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Helper script to run after installing dependencies.  This brings the VM back
-# up and copies over the zfs source directory.
-echo "Build modules in QEMU machine"
-sudo virsh start openzfs
-.github/workflows/scripts/qemu-wait-for-vm.sh vm0
-rsync -ar $HOME/work/zfs/zfs zfs@vm0:./

.github/workflows/scripts/qemu-test-repo-vm.sh

@@ -1,90 +0,0 @@
-#!/bin/bash
-#
-# Do a test install of ZFS from an external repository.
-#
-# USAGE:
-#
-# 	./qemu-test-repo-vm [URL]
-#
-# URL:		URL to use instead of http://download.zfsonlinux.org
-#		If blank, use the default repo from zfs-release RPM.
-
-set -e
-
-source /etc/os-release
-OS="$ID"
-VERSION="$VERSION_ID"
-
-ALTHOST=""
-if [ -n "$1" ] ; then
-	ALTHOST="$1"
-fi
-
-# Write summary to /tmp/repo so our artifacts scripts pick it up
-mkdir /tmp/repo
-SUMMARY=/tmp/repo/$OS-$VERSION-summary.txt
-
-# $1: Repo 'zfs' 'zfs-kmod' 'zfs-testing' 'zfs-testing-kmod'
-# $2: (optional) Alternate host than 'http://download.zfsonlinux.org' to
-#     install from.  Blank means use default from zfs-release RPM.
-function test_install {
-	repo=$1
-	host=""
-	if [ -n "$2" ] ; then
-		host=$2
-	fi
-
-	args="--disablerepo=zfs --enablerepo=$repo"
-
-	# If we supplied an alternate repo URL, and have not already edited
-	# zfs.repo, then update the repo file.
-	if [ -n "$host" ] && ! grep -q $host /etc/yum.repos.d/zfs.repo ; then
-		sudo sed -i "s;baseurl=http://download.zfsonlinux.org;baseurl=$host;g" /etc/yum.repos.d/zfs.repo
-	fi
-
-	sudo dnf -y install $args zfs zfs-test
-
-	# Load modules and create a simple pool as a sanity test.
-	sudo /usr/share/zfs/zfs.sh -r
-	truncate -s 100M /tmp/file
-	sudo zpool create tank /tmp/file
-	sudo zpool status
-
-	# Print out repo name, rpm installed (kmod or dkms), and repo URL
-	baseurl=$(grep -A 5 "\[$repo\]" /etc/yum.repos.d/zfs.repo  | awk -F'=' '/baseurl=/{print $2; exit}')
-	package=$(sudo rpm -qa | grep zfs | grep -E 'kmod|dkms')
-
-	echo "$repo $package $baseurl" >> $SUMMARY
-
-	sudo zpool destroy tank
-	sudo rm /tmp/file
-	sudo dnf -y remove zfs
-}
-
-echo "##[group]Installing from repo"
-# The openzfs docs are the authoritative instructions for the install.  Use
-# the specific version of zfs-release RPM it recommends.
-case $OS in
-almalinux*)
-	url='https://raw.githubusercontent.com/openzfs/openzfs-docs/refs/heads/master/docs/Getting%20Started/RHEL-based%20distro/index.rst'
-	name=$(curl -Ls $url | grep 'dnf install' | grep -Eo 'zfs-release-[0-9]+-[0-9]+')
-	sudo dnf -y install https://zfsonlinux.org/epel/$name$(rpm --eval "%{dist}").noarch.rpm 2>&1
-	sudo rpm -qi zfs-release
-	test_install zfs $ALTHOST
-	test_install zfs-kmod $ALTHOST
-	test_install zfs-testing $ALTHOST
-	test_install zfs-testing-kmod $ALTHOST
-	;;
-fedora*)
-	url='https://raw.githubusercontent.com/openzfs/openzfs-docs/refs/heads/master/docs/Getting%20Started/Fedora/index.rst'
-	name=$(curl -Ls $url | grep 'dnf install' | grep -Eo 'zfs-release-[0-9]+-[0-9]+')
-	sudo dnf -y install -y https://zfsonlinux.org/fedora/$name$(rpm --eval "%{dist}").noarch.rpm
-	test_install zfs $ALTHOST
-	;;
-esac
-echo "##[endgroup]"
-
-# Write out a simple version of the summary here. Later on we will collate all
-# the summaries and put them into a nice table in the workflow Summary page.
-echo "Summary: "
-cat $SUMMARY

.github/workflows/scripts/qemu-wait-for-vm.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-#
-# Wait for a VM to boot up and become active.  This is used in a number of our
-# scripts.
-#
-# $1: VM hostname or IP address
-
-while pidof /usr/bin/qemu-system-x86_64 >/dev/null; do
-  ssh 2>/dev/null zfs@$1 "uname -a" && break
-done

.github/workflows/scripts/replace-dupes-with-symlinks.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-#
-# Recursively go though a directory structure and replace duplicate files with
-# symlinks.  This cuts down our RPM repo size by ~25%.
-#
-#	replace-dupes-with-symlinks.sh [DIR]
-#
-# DIR: Directory to traverse.  Defaults to current directory if not specified.
-#
-
-src="$1"
-if [ -z "$src" ] ; then
-	src="."
-fi
-
-declare -A db
-
-pushd "$src"
-while read line ; do
-	bn="$(basename $line)"
-	if [ -z "${db[$bn]}" ] ; then
-		# First time this file has been seen
-		db[$bn]="$line"
-	else
-		if diff -b "$line" "${db[$bn]}" &>/dev/null ; then
-			# Files are the same, make a symlink
-			rm "$line"
-			ln -sr "${db[$bn]}" "$line"
-		fi
-	fi
-done <<< "$(find . -type f)"
-popd

.github/workflows/zfs-qemu-packages.yml

@@ -1,140 +0,0 @@
-# This workflow is used to build and test RPM packages.  It is a
-# 'workflow_dispatch' workflow, which means it gets run manually.
-#
-# The workflow has a dropdown menu with two options:
-#
-# Build RPMs - Build release RPMs and tarballs and put them into an artifact
-#              ZIP file.  The directory structure used in the ZIP file mirrors
-#              the ZFS yum repo.
-#
-# Test repo -  Test install the ZFS RPMs from the ZFS repo.  On EL distos, this
-#              will do a DKMS and KMOD test install from both the regular and
-#              testing repos.  On Fedora, it will do a DKMS install from the
-#              regular repo.  All test install results will be displayed in the
-#              Summary page.  Note that the workflow provides an optional text
-#              text box where you can specify the full URL to an alternate repo.
-#              If left blank, it will install from the default repo from the
-#              zfs-release RPM (http://download.zfsonlinux.org).
-#
-# Most users will never need to use this workflow.  It will be used primary by
-# ZFS admins for building and testing releases.
-#
-name: zfs-qemu-packages
-
-on:
-  workflow_dispatch:
-    inputs:
-      test_type:
-        type: choice
-        required: false
-        default: "Build RPMs"
-        description: "Build RPMs or test the repo?"
-        options:
-        - "Build RPMs"
-        - "Test repo"
-      repo_url:
-        type: string
-        required: false
-        default: ""
-        description: "(optional) repo URL (blank: use http://download.zfsonlinux.org)"
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  zfs-qemu-packages-jobs:
-    name: qemu-VMs
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ['almalinux8', 'almalinux9', 'fedora40', 'fedora41', 'fedora42']
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-
-    - name: Setup QEMU
-      timeout-minutes: 10
-      run: .github/workflows/scripts/qemu-1-setup.sh
-
-    - name: Start build machine
-      timeout-minutes: 10
-      run: .github/workflows/scripts/qemu-2-start.sh ${{ matrix.os }}
-
-    - name: Install dependencies
-      timeout-minutes: 20
-      run: |
-        .github/workflows/scripts/qemu-3-deps.sh ${{ matrix.os }}
-
-    - name: Build modules or Test repo
-      timeout-minutes: 30
-      run: |
-        set -e
-        if [ "${{ github.event.inputs.test_type }}" == "Test repo" ] ; then
-                # Bring VM back up and copy over zfs source
-                .github/workflows/scripts/qemu-prepare-for-build.sh
-
-                mkdir -p /tmp/repo
-                ssh zfs@vm0 '$HOME/zfs/.github/workflows/scripts/qemu-test-repo-vm.sh' ${{ github.event.inputs.repo_url }}
-        else
-                .github/workflows/scripts/qemu-4-build.sh --repo --release --dkms --tarball ${{ matrix.os }}
-        fi
-
-    - name: Prepare artifacts
-      if: always()
-      timeout-minutes: 10
-      run: |
-        rsync -a zfs@vm0:/tmp/repo /tmp || true
-        .github/workflows/scripts/replace-dupes-with-symlinks.sh /tmp/repo
-        tar -cf ${{ matrix.os }}-repo.tar -C /tmp repo
-
-    - uses: actions/upload-artifact@v4
-      id: artifact-upload
-      if: always()
-      with:
-        name: ${{ matrix.os }}-repo
-        path: ${{ matrix.os }}-repo.tar
-        compression-level: 0
-        retention-days: 2
-        if-no-files-found: ignore
-
-  combine_repos:
-    if: always()
-    needs: [zfs-qemu-packages-jobs]
-    name: "Results"
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/download-artifact@v4
-      id: artifact-download
-      if: always()
-    - name: Test Summary
-      if: always()
-      run: |
-        for i in $(find . -type f -iname "*.tar") ; do
-          tar -xf $i -C /tmp
-        done
-        tar -cf all-repo.tar -C /tmp repo
-
-        # If we're installing from a repo, print out the summary of the versions
-        # that got installed using Markdown.
-        if [ "${{ github.event.inputs.test_type }}" == "Test repo" ] ; then
-          cd /tmp/repo
-          for i in $(ls *.txt) ; do
-            nicename="$(echo $i | sed 's/.txt//g; s/-/ /g')"
-            echo "### $nicename" >> $GITHUB_STEP_SUMMARY
-            echo "|repo|RPM|URL|" >> $GITHUB_STEP_SUMMARY
-            echo "|:---|:---|:---|" >> $GITHUB_STEP_SUMMARY
-            awk '{print "|"$1"|"$2"|"$3"|"}' $i >> $GITHUB_STEP_SUMMARY
-          done
-        fi
-
-    - uses: actions/upload-artifact@v4
-      id: artifact-upload2
-      if: always()
-      with:
-        name: all-repo
-        path: all-repo.tar
-        compression-level: 0
-        retention-days: 5
-        if-no-files-found: ignore

.github/workflows/zfs-qemu.yml

@@ -1,180 +0,0 @@
-name: zfs-qemu
-
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
-    inputs:
-      include_stream9:
-        type: boolean
-        required: false
-        default: false
-        description: 'Test on CentOS 9 stream'
-      include_stream10:
-        type: boolean
-        required: false
-        default: false
-        description: 'Test on CentOS 10 stream'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  test-config:
-    name: Setup
-    runs-on: ubuntu-24.04
-    outputs:
-      test_os: ${{ steps.os.outputs.os }}
-      ci_type: ${{ steps.os.outputs.ci_type }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Generate OS config and CI type
-        id: os
-        run: |
-          FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "fedora42", "freebsd13-4r", "freebsd14-2r", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]'
-          QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora42", "freebsd14-2r", "ubuntu24"]'
-          # determine CI type when running on PR
-          ci_type="full"
-          if ${{ github.event_name == 'pull_request' }}; then
-            head=${{ github.event.pull_request.head.sha }}
-            base=${{ github.event.pull_request.base.sha }}
-            ci_type=$(python3 .github/workflows/scripts/generate-ci-type.py $head $base)
-          fi
-          if [ "$ci_type" == "quick" ]; then
-            os_selection="$QUICK_OS"
-          else
-            os_selection="$FULL_OS"
-          fi
-          os_json=$(echo ${os_selection} | jq -c)
-
-          # Add optional runners
-          if [ "${{ github.event.inputs.include_stream9 }}" == 'true' ]; then
-            os_json=$(echo $os_json | jq -c '. += ["centos-stream9"]')
-          fi
-          if [ "${{ github.event.inputs.include_stream10 }}" == 'true' ]; then
-            os_json=$(echo $os_json | jq -c '. += ["centos-stream10"]')
-          fi
-
-          echo $os_json
-          echo "os=$os_json" >> $GITHUB_OUTPUT
-          echo "ci_type=$ci_type" >> $GITHUB_OUTPUT
-
-  qemu-vm:
-    name: qemu-x86
-    needs: [ test-config ]
-    strategy:
-      fail-fast: false
-      matrix:
-        # rhl:     almalinux8, almalinux9, centos-stream9, fedora40, fedora41
-        # debian:  debian11, debian12, ubuntu20, ubuntu22, ubuntu24
-        # misc:    archlinux, tumbleweed
-        # FreeBSD variants of 2024-12:
-        # FreeBSD Release: freebsd13-4r, freebsd14-2r
-        # FreeBSD Stable:  freebsd13-4s, freebsd14-2s
-        # FreeBSD Current: freebsd15-0c
-        os: ${{ fromJson(needs.test-config.outputs.test_os) }}
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-
-    - name: Setup QEMU
-      timeout-minutes: 10
-      run: .github/workflows/scripts/qemu-1-setup.sh
-
-    - name: Start build machine
-      timeout-minutes: 10
-      run: .github/workflows/scripts/qemu-2-start.sh ${{ matrix.os }}
-
-    - name: Install dependencies
-      timeout-minutes: 20
-      run: .github/workflows/scripts/qemu-3-deps.sh ${{ matrix.os }}
-
-    - name: Build modules
-      timeout-minutes: 30
-      run: .github/workflows/scripts/qemu-4-build.sh --poweroff --enable-debug ${{ matrix.os }}
-
-    - name: Setup testing machines
-      timeout-minutes: 5
-      run: .github/workflows/scripts/qemu-5-setup.sh
-
-    - name: Run tests
-      timeout-minutes: 270
-      run: .github/workflows/scripts/qemu-6-tests.sh
-      env:
-        CI_TYPE: ${{ needs.test-config.outputs.ci_type }}
-
-    - name: Prepare artifacts
-      if: always()
-      timeout-minutes: 10
-      run: .github/workflows/scripts/qemu-7-prepare.sh
-
-    - uses: actions/upload-artifact@v4
-      id: artifact-upload
-      if: always()
-      with:
-        name: Logs-functional-${{ matrix.os }}
-        path: /tmp/qemu-${{ matrix.os }}.tar
-        if-no-files-found: ignore
-
-    - name: Test Summary
-      if: always()
-      run: .github/workflows/scripts/qemu-8-summary.sh '${{ steps.artifact-upload.outputs.artifact-url }}'
-
-  cleanup:
-    if: always()
-    name: Cleanup
-    runs-on: ubuntu-latest
-    needs: [ qemu-vm ]
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-    - uses: actions/download-artifact@v4
-    - name: Generating summary
-      run: .github/workflows/scripts/qemu-9-summary-page.sh
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 2
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 3
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 4
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 5
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 6
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 7
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 8
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 9
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 10
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 11
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 12
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 13
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 14
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 15
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 16
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 17
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 18
-    - name: Generating summary...
-      run: .github/workflows/scripts/qemu-9-summary-page.sh 19
-    - uses: actions/upload-artifact@v4
-      with:
-        name: Summary Files
-        path: out-*

.github/workflows/zloop.yml

@@ -1,77 +0,0 @@
-name: zloop
-
-on:
-  push:
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  zloop:
-    runs-on: ubuntu-24.04
-    env:
-      TEST_DIR: /var/tmp/zloop
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-    - name: Install dependencies
-      run: |
-        sudo apt-get purge -y snapd google-chrome-stable firefox
-        ONLY_DEPS=1 .github/workflows/scripts/qemu-3-deps-vm.sh ubuntu24
-    - name: Autogen.sh
-      run: |
-        sed -i '/DEBUG_CFLAGS="-Werror"/s/^/#/' config/zfs-build.m4
-        ./autogen.sh
-    - name: Configure
-      run: |
-        ./configure --prefix=/usr --enable-debug --enable-debuginfo \
-           --enable-asan --enable-ubsan \
-           --enable-debug-kmem --enable-debug-kmem-tracking
-    - name: Make
-      run: |
-        make -j$(nproc)
-    - name: Install
-      run: |
-        sudo make install
-        sudo depmod
-        sudo modprobe zfs
-    - name: Tests
-      run: |
-        sudo mkdir -p $TEST_DIR
-        # run for 10 minutes or at most 6 iterations for a maximum runner
-        # time of 60 minutes.
-        sudo /usr/share/zfs/zloop.sh -t 600 -I 6 -l -m 1 -- -T 120 -P 60
-    - name: Prepare artifacts
-      if: failure()
-      run: |
-        sudo chmod +r -R $TEST_DIR/
-    - name: Ztest log
-      if: failure()
-      run: |
-        grep -B10 -A1000 'ASSERT' $TEST_DIR/*/ztest.out || tail -n 1000 $TEST_DIR/*/ztest.out
-    - name: Gdb log
-      if: failure()
-      run: |
-        sed -n '/Backtraces (full)/q;p' $TEST_DIR/*/ztest.gdb
-    - name: Zdb log
-      if: failure()
-      run: |
-        cat $TEST_DIR/*/ztest.zdb
-    - uses: actions/upload-artifact@v4
-      if: failure()
-      with:
-        name: Logs
-        path: |
-          /var/tmp/zloop/*/
-          !/var/tmp/zloop/*/vdev/
-        if-no-files-found: ignore
-    - uses: actions/upload-artifact@v4
-      if: failure()
-      with:
-        name: Pool files
-        path: |
-          /var/tmp/zloop/*/vdev/
-        if-no-files-found: ignore

.gitignore

@@ -1,7 +1,6 @@
 #
-# This is the top-level .gitignore file:
-# ignore everything except a list of allowed files.
-#
+# N.B.
+# This is the toplevel .gitignore file.
 # This is not the place for entries that are specific to
 # a subdirectory.  Instead add those files to the
 # .gitignore file in that subdirectory.
@@ -11,57 +10,6 @@
 # command after changing this file, to see if there are
 # any tracked files which get ignored after the change.
 
-*
-
-!.github
-!cmd
-!config
-!contrib
-!etc
-!include
-!lib
-!man
-!module
-!rpm
-!scripts
-!tests
-!udev
-
-!.github/**
-!cmd/**
-!config/**
-!contrib/**
-!etc/**
-!include/**
-!lib/**
-!man/**
-!module/**
-!rpm/**
-!scripts/**
-!tests/**
-!udev/**
-
-!.editorconfig
-!.cirrus.yml
-!.gitignore
-!.gitmodules
-!.mailmap
-!AUTHORS
-!autogen.sh
-!CODE_OF_CONDUCT.md
-!configure.ac
-!copy-builtin
-!COPYRIGHT
-!LICENSE
-!Makefile.am
-!META
-!NEWS
-!NOTICE
-!README.md
-!RELEASES.md
-!TEST
-!zfs.release.in
-
 #
 # Normal rules
 #
@@ -83,8 +31,35 @@
 modules.order
 Makefile
 Makefile.in
-changelog
+
+#
+# Top level generated files specific to this top level dir
+#
+/bin
+/configure
+/config.log
+/config.status
+/libtool
+/zfs_config.h
+/zfs_config.h.in
+/zfs.release
+/stamp-h1
+/aclocal.m4
+/autom4te.cache
+
+#
+# Top level generic files
+#
+!.gitignore
+tags
+TAGS
+current
+cscope.*
+*.rpm
+*.deb
+*.tar.gz
 *.patch
 *.orig
-*.tmp
 *.log
+venv
+

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "scripts/zfs-images"]
 	path = scripts/zfs-images
-	url = https://github.com/openzfs/zfs-images
+	url = https://github.com/zfsonlinux/zfs-images

.mailmap

@@ -1,221 +0,0 @@
-# This file maps the name+email seen in a commit back to a canonical
-# name+email. Git will replace the commit name/email with the canonical version
-# wherever it sees it.
-#
-# If there is a commit in the history with a "wrong" name or email, list it
-# here. If you regularly commit with an alternate name or email address and
-# would like to ensure that you are always listed consistently in the repo, add
-# mapping here.
-#
-# On the other hand, if you use multiple names or email addresses legitimately
-# (eg you use a company email address for your paid OpenZFS work, and a
-# personal address for your evening side projects), then don't map one to the
-# other here.
-#
-# The most common formats are:
-#
-# Canonical Name <canonical-email>
-# Canonical Name <canonical-email> <commit-email>
-# Canonical Name <canonical-email> Commit Name <commit-email>
-#
-# See https://git-scm.com/docs/gitmailmap for more info.
-
-# These maps are making names consistent where they have varied but the email
-# address has never changed. In most cases, the full name is in the
-# Signed-off-by of a commit with a matching author.
-Ahelenia Ziemiańska <nabijaczleweli@gmail.com>
-Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
-Alex John <alex@stty.io>
-Andreas Dilger <adilger@dilger.ca>
-Andrew Walker <awalker@ixsystems.com>
-Benedikt Neuffer <github@itfriend.de>
-Chengfei Zhu <chengfeix.zhu@intel.com>
-ChenHao Lu <18302010006@fudan.edu.cn>
-Chris Lindee <chris.lindee+github@gmail.com>
-Colm Buckley <colm@tuatha.org>
-Crag Wang <crag0715@gmail.com>
-Damian Szuberski <szuberskidamian@gmail.com>
-Daniel Kolesa <daniel@octaforge.org>
-Debabrata Banerjee <dbavatar@gmail.com>
-Finix Yan <yanchongwen@hotmail.com>
-Gaurav Kumar <gauravk.18@gmail.com>
-Gionatan Danti <g.danti@assyoma.it>
-Glenn Washburn <development@efficientek.com>
-Gordan Bobic <gordan.bobic@gmail.com>
-Gregory Bartholomew <gregory.lee.bartholomew@gmail.com>
-hedong zhang <h_d_zhang@163.com>
-Ilkka Sovanto <github@ilkka.kapsi.fi>
-InsanePrawn <Insane.Prawny@gmail.com>
-Jason Cohen <jwittlincohen@gmail.com>
-Jason Harmening <jason.harmening@gmail.com>
-Jeremy Faulkner <gldisater@gmail.com>
-Jinshan Xiong <jinshan.xiong@gmail.com>
-John Poduska <jpoduska@datto.com>
-Justin Scholz <git@justinscholz.de>
-Ka Ho Ng <khng300@gmail.com>
-Kash Pande <github@tripleback.net>
-Kay Pedersen <christianpe96@gmail.com>
-KernelOfTruth <kerneloftruth@gmail.com>
-Liu Hua <liu.hua130@zte.com.cn>
-Liu Qing <winglq@gmail.com>
-loli10K <ezomori.nozomu@gmail.com>
-Mart Frauenlob <allkind@fastest.cc>
-Matthias Blankertz <matthias@blankertz.org>
-Michael Gmelin <grembo@FreeBSD.org>
-Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
-Piotr Kubaj <pkubaj@anongoth.pl>
-Quentin Zdanis <zdanisq@gmail.com>
-Roberto Ricci <ricci@disroot.org>
-Rob Norris <robn@despairlabs.com>
-Rob Norris <rob.norris@klarasystems.com>
-Sam Lunt <samuel.j.lunt@gmail.com>
-Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com>
-Sebastian Wuerl <s.wuerl@mailbox.org>
-SHENGYI HONG <aokblast@FreeBSD.org>
-Stoiko Ivanov <github@nomore.at>
-Tamas TEVESZ <ice@extreme.hu>
-WHR <msl0000023508@gmail.com>
-Yanping Gao <yanping.gao@xtaotech.com>
-Youzhong Yang <youzhong@gmail.com>
-
-# Signed-off-by: overriding Author:
-Alexander Ziaee <ziaee@FreeBSD.org> <concussious@runbox.com>
-Ryan <errornointernet@envs.net> <error.nointernet@gmail.com>
-Sietse <sietse@wizdom.nu> <uglymotha@wizdom.nu>
-Phil Sutter <phil@nwl.cc> <p.github@nwl.cc>
-poscat <poscat@poscat.moe> <poscat0x04@outlook.com>
-Qiuhao Chen <chenqiuhao1997@gmail.com> <haohao0924@126.com>
-Yuxin Wang <yuxinwang9999@gmail.com> <Bi11gates9999@gmail.com>
-Zhenlei Huang <zlei@FreeBSD.org> <zlei.huang@gmail.com>
-
-# Commits from strange places, long ago
-Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
-Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@fedora-17-amd64.(none)>
-Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@myhost.(none)>
-Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-16-145.us-west-1.compute.internal>
-Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-20-6.us-west-1.compute.internal>
-Herb Wartens <wartens2@llnl.gov> <wartens2@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
-Ned Bass <bass6@llnl.gov> <bass6@zeno1.(none)>
-Tulsi Jain <tulsi.jain@delphix.com> <tulsi.jain@Tulsi-Jains-MacBook-Pro.local>
-
-# Mappings from Github no-reply addresses
-ajs124 <git@ajs124.de> <ajs124@users.noreply.github.com>
-Alek Pinchuk <apinchuk@axcient.com> <alek-p@users.noreply.github.com>
-Alexander Lobakin <alobakin@pm.me> <solbjorn@users.noreply.github.com>
-Alexey Smirnoff <fling@member.fsf.org> <fling-@users.noreply.github.com>
-Allen Holl <allen.m.holl@gmail.com> <65494904+allen-4@users.noreply.github.com>
-Alphan Yılmaz <alphanyilmaz@gmail.com> <a1ea321@users.noreply.github.com>
-Ameer Hamza <ahamza@ixsystems.com> <106930537+ixhamza@users.noreply.github.com>
-Andrew J. Hesford <ajh@sideband.org> <48421688+ahesford@users.noreply.github.com>>
-Andrew Sun <me@andrewsun.com> <as-com@users.noreply.github.com>
-Aron Xu <happyaron.xu@gmail.com> <happyaron@users.noreply.github.com>
-Arun KV <arun.kv@datacore.com> <65647132+arun-kv@users.noreply.github.com>
-Ben Wolsieffer <benwolsieffer@gmail.com> <lopsided98@users.noreply.github.com>
-bernie1995 <bernie.pikes@gmail.com> <42413912+bernie1995@users.noreply.github.com>
-Bojan Novković <bnovkov@FreeBSD.org> <72801811+bnovkov@users.noreply.github.com>
-Boris Protopopov <boris.protopopov@actifio.com> <bprotopopov@users.noreply.github.com>
-Brad Forschinger <github@bnjf.id.au> <bnjf@users.noreply.github.com>
-Brandon Thetford <brandon@dodecatec.com> <dodexahedron@users.noreply.github.com>
-buzzingwires <buzzingwires@outlook.com> <131118055+buzzingwires@users.noreply.github.com>
-Cedric Maunoury <cedric.maunoury@gmail.com> <38213715+cedricmaunoury@users.noreply.github.com>
-Charles Suh <charles.suh@gmail.com> <charlessuh@users.noreply.github.com>
-Chris Peredun <chris.peredun@ixsystems.com> <126915832+chrisperedun@users.noreply.github.com>
-Dacian Reece-Stremtan <dacianstremtan@gmail.com> <35844628+dacianstremtan@users.noreply.github.com>
-Damian Szuberski <szuberskidamian@gmail.com> <30863496+szubersk@users.noreply.github.com>
-Daniel Hiepler <d-git@coderdu.de> <32984777+heeplr@users.noreply.github.com>
-Daniel Kobras <d.kobras@science-computing.de> <sckobras@users.noreply.github.com>
-Daniel Reichelt <hacking@nachtgeist.net> <nachtgeist@users.noreply.github.com>
-David Quigley <david.quigley@intel.com> <dpquigl@users.noreply.github.com>
-Dennis R. Friedrichsen <dennis.r.friedrichsen@gmail.com> <31087738+dennisfriedrichsen@users.noreply.github.com>
-Dex Wood <slash2314@gmail.com> <slash2314@users.noreply.github.com>
-DHE <git@dehacked.net> <DeHackEd@users.noreply.github.com>
-Dmitri John Ledkov <dimitri.ledkov@canonical.com> <19779+xnox@users.noreply.github.com>
-Dries Michiels <driesm.michiels@gmail.com> <32487486+driesmp@users.noreply.github.com>
-Edmund Nadolski <edmund.nadolski@ixsystems.com> <137826107+ednadolski-ix@users.noreply.github.com>
-Érico Nogueira <erico.erc@gmail.com> <34201958+ericonr@users.noreply.github.com>
-Fedor Uporov <fuporov.vstack@gmail.com> <60701163+fuporovvStack@users.noreply.github.com>
-Felix Dörre <felix@dogcraft.de> <felixdoerre@users.noreply.github.com>
-Felix Neumärker <xdch47@posteo.de> <34678034+xdch47@users.noreply.github.com>
-Finix Yan <yancw@info2soft.com> <Finix1979@users.noreply.github.com>
-Gaurav Kumar <gauravk.18@gmail.com> <gaurkuma@users.noreply.github.com>
-George Gaydarov <git@gg7.io> <gg7@users.noreply.github.com>
-Georgy Yakovlev <gyakovlev@gentoo.org> <168902+gyakovlev@users.noreply.github.com>
-Gerardwx <gerardw@alum.mit.edu> <Gerardwx@users.noreply.github.com>
-Gian-Carlo DeFazio <defazio1@llnl.gov> <defaziogiancarlo@users.noreply.github.com>
-Giuseppe Di Natale <dinatale2@llnl.gov> <dinatale2@users.noreply.github.com>
-Hajo Möller <dasjoe@gmail.com> <dasjoe@users.noreply.github.com>
-Harry Mallon <hjmallon@gmail.com> <1816667+hjmallon@users.noreply.github.com>
-Hiếu Lê <leorize+oss@disroot.org> <alaviss@users.noreply.github.com>
-Jake Howard <git@theorangeone.net> <RealOrangeOne@users.noreply.github.com>
-James Cowgill <james.cowgill@mips.com> <jcowgill@users.noreply.github.com>
-Jaron Kent-Dobias <jaron@kent-dobias.com> <kentdobias@users.noreply.github.com>
-Jason King <jason.king@joyent.com> <jasonbking@users.noreply.github.com>
-Jeff Dike <jdike@akamai.com> <52420226+jdike@users.noreply.github.com>
-Jitendra Patidar <jitendra.patidar@nutanix.com> <53164267+jsai20@users.noreply.github.com>
-João Carlos Mendes Luís <jonny@jonny.eng.br> <dioni21@users.noreply.github.com>
-John Eismeier <john.eismeier@gmail.com> <32205350+jeis2497052@users.noreply.github.com>
-John L. Hammond <john.hammond@intel.com> <35266395+jhammond-intel@users.noreply.github.com>
-John-Mark Gurney <jmg@funkthat.com> <jmgurney@users.noreply.github.com>
-John Ramsden <johnramsden@riseup.net> <johnramsden@users.noreply.github.com>
-Jonathon Fernyhough <jonathon@m2x.dev> <559369+jonathonf@users.noreply.github.com>
-Jose Luis Duran <jlduran@gmail.com> <jlduran@users.noreply.github.com>
-Justin Hibbits <chmeeedalf@gmail.com> <chmeeedalf@users.noreply.github.com>
-Kevin Greene <kevin.greene@delphix.com> <104801862+kxgreene@users.noreply.github.com>
-Kevin Jin <lostking2008@hotmail.com> <33590050+jxdking@users.noreply.github.com>
-Kevin P. Fleming <kevin@km6g.us> <kpfleming@users.noreply.github.com>
-Krzysztof Piecuch <piecuch@kpiecuch.pl> <3964215+pikrzysztof@users.noreply.github.com>
-Kyle Evans <kevans@FreeBSD.org> <kevans91@users.noreply.github.com>
-Laurențiu Nicola <lnicola@dend.ro> <lnicola@users.noreply.github.com>
-loli10K <ezomori.nozomu@gmail.com> <loli10K@users.noreply.github.com>
-Lorenz Hüdepohl <dev@stellardeath.org> <lhuedepohl@users.noreply.github.com>
-Luís Henriques <henrix@camandro.org> <73643340+lumigch@users.noreply.github.com>
-Marcin Skarbek <git@skarbek.name> <mskarbek@users.noreply.github.com>
-Matt Fiddaman <github@m.fiddaman.uk> <81489167+matt-fidd@users.noreply.github.com>
-Maxim Filimonov <che@bein.link> <part1zano@users.noreply.github.com>
-Max Zettlmeißl <max@zettlmeissl.de> <6818198+maxz@users.noreply.github.com>
-Michael Niewöhner <foss@mniewoehner.de> <c0d3z3r0@users.noreply.github.com>
-Michael Zhivich <mzhivich@akamai.com> <33133421+mzhivich@users.noreply.github.com>
-MigeljanImeri <ImeriMigel@gmail.com> <78048439+MigeljanImeri@users.noreply.github.com>
-Mo Zhou <cdluminate@gmail.com> <5723047+cdluminate@users.noreply.github.com>
-Nick Mattis <nickm970@gmail.com> <nmattis@users.noreply.github.com>
-omni <omni+vagant@hack.org> <79493359+omnivagant@users.noreply.github.com>
-Pablo Correa Gómez <ablocorrea@hotmail.com> <32678034+pablofsf@users.noreply.github.com>
-Paul Zuchowski <pzuchowski@datto.com> <31706010+PaulZ-98@users.noreply.github.com>
-Peter Ashford <ashford@accs.com> <pashford@users.noreply.github.com>
-Peter Dave Hello <hsu@peterdavehello.org> <PeterDaveHello@users.noreply.github.com>
-Peter Wirdemo <peter.wirdemo@gmail.com> <4224155+pewo@users.noreply.github.com>
-Petros Koutoupis <petros@petroskoutoupis.com> <pkoutoupis@users.noreply.github.com>
-Ping Huang <huangping@smartx.com> <101400146+hpingfs@users.noreply.github.com>
-Piotr P. Stefaniak <pstef@freebsd.org> <pstef@users.noreply.github.com>
-Richard Allen <belperite@gmail.com> <33836503+belperite@users.noreply.github.com>
-Rich Ercolani <rincebrain@gmail.com> <214141+rincebrain@users.noreply.github.com>
-Rick Macklem <rmacklem@uoguelph.ca> <64620010+rmacklem@users.noreply.github.com>
-Rob Wing <rob.wing@klarasystems.com> <98866084+rob-wing@users.noreply.github.com>
-Roman Strashkin <roman.strashkin@nexenta.com> <Ramzec@users.noreply.github.com>
-Ryan Hirasaki <ryanhirasaki@gmail.com> <4690732+RyanHir@users.noreply.github.com>
-Samuel Wycliffe J <samwyc@hpe.com> <115969550+samwyc@users.noreply.github.com>
-Samuel Wycliffe <samuelwycliffe@gmail.com> <50765275+npc203@users.noreply.github.com>
-Savyasachee Jha <hi@savyasacheejha.com> <savyajha@users.noreply.github.com>
-Scott Colby <scott@scolby.com> <scolby33@users.noreply.github.com>
-Sean Eric Fagan <kithrup@mac.com> <kithrup@users.noreply.github.com>
-Spencer Kinny <spencerkinny1995@gmail.com> <30333052+Spencer-Kinny@users.noreply.github.com>
-Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com> <75025422+nssrikanth@users.noreply.github.com>
-Stefan Lendl <s.lendl@proxmox.com> <1321542+stfl@users.noreply.github.com>
-Thomas Bertschinger <bertschinger@lanl.gov> <101425190+bertschinger@users.noreply.github.com>
-Thomas Geppert <geppi@digitx.de> <geppi@users.noreply.github.com>
-Tim Crawford <tcrawford@datto.com> <crawfxrd@users.noreply.github.com>
-Todd Seidelmann <18294602+seidelma@users.noreply.github.com>
-Tom Matthews <tom@axiom-partners.com> <tomtastic@users.noreply.github.com>
-Tony Perkins <tperkins@datto.com> <62951051+tony-zfs@users.noreply.github.com>
-Torsten Wörtwein <twoertwein@gmail.com> <twoertwein@users.noreply.github.com>
-Tulsi Jain <tulsi.jain@delphix.com> <TulsiJain@users.noreply.github.com>
-Václav Skála <skala@vshosting.cz> <33496485+vaclavskala@users.noreply.github.com>
-Vaibhav Bhanawat <vaibhav.bhanawat@delphix.com> <88050553+vaibhav-delphix@users.noreply.github.com>
-Vandana Rungta <vrungta@amazon.com> <46906819+vandanarungta@users.noreply.github.com>
-Violet Purcell <vimproved@inventati.org> <66446404+vimproved@users.noreply.github.com>
-Vipin Kumar Verma <vipin.verma@hpe.com> <75025470+vermavipinkumar@users.noreply.github.com>
-Wolfgang Bumiller <w.bumiller@proxmox.com> <Blub@users.noreply.github.com>
-XDTG <click1799@163.com> <35128600+XDTG@users.noreply.github.com>
-xtouqh <xtouqh@hotmail.com> <72357159+xtouqh@users.noreply.github.com>
-Yuri Pankov <yuripv@FreeBSD.org> <113725409+yuripv@users.noreply.github.com>
-Yuri Pankov <yuripv@FreeBSD.org> <82001006+yuripv@users.noreply.github.com>

.travis.yml

@@ -0,0 +1,38 @@
+language: c
+sudo: required
+env:
+  global:
+    # Travis limits maximum log size, we have to cut tests output 
+    - ZFS_TEST_TRAVIS_LOG_MAX_LENGTH=800
+  matrix:
+    # tags are mainly in ascending order
+    - ZFS_TEST_TAGS='acl,atime,bootfs,cachefile,casenorm,chattr,checksum,clean_mirror,compression,ctime,delegate,devices,events,exec,fault,features,grow_pool,zdb,zfs,zfs_bookmark,zfs_change-key,zfs_clone,zfs_copies,zfs_create,zfs_diff,zfs_get,zfs_inherit,zfs_load-key,zfs_rename'
+    - ZFS_TEST_TAGS='cache,history,hkdf,inuse,zfs_property,zfs_receive,zfs_reservation,zfs_send,zfs_set,zfs_share,zfs_snapshot,zfs_unload-key,zfs_unmount,zfs_unshare,zfs_upgrade,zpool,zpool_add,zpool_attach,zpool_clear,zpool_create,zpool_destroy,zpool_detach'
+    - ZFS_TEST_TAGS='grow_replicas,mv_files,cli_user,zfs_mount,zfs_promote,zfs_rollback,zpool_events,zpool_expand,zpool_export,zpool_get,zpool_history,zpool_import,zpool_labelclear,zpool_offline,zpool_online,zpool_remove,zpool_reopen,zpool_replace,zpool_scrub,zpool_set,zpool_status,zpool_sync,zpool_upgrade'
+    - ZFS_TEST_TAGS='zfs_destroy,large_files,largest_pool,link_count,migration,mmap,mmp,mount,nestedfs,no_space,nopwrite,online_offline,pool_names,poolversion,privilege,quota,raidz,redundancy,rsend'
+    - ZFS_TEST_TAGS='inheritance,refquota,refreserv,rename_dirs,replacement,reservation,rootpool,scrub_mirror,slog,snapshot,snapused,sparse,threadsappend,tmpfile,truncate,upgrade,userquota,vdev_zaps,write_dirs,xattr,zvol,libzfs'
+before_install:
+    - sudo apt-get -qq update
+    - sudo apt-get install --yes -qq build-essential autoconf libtool gawk alien fakeroot linux-headers-$(uname -r)
+    - sudo apt-get install --yes -qq zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libssl-dev
+    # packages for tests
+    - sudo apt-get install --yes -qq parted lsscsi ksh attr acl nfs-kernel-server fio
+install:
+    - git clone --depth=1 https://github.com/zfsonlinux/spl
+    - cd spl
+    - git checkout master
+    - sh autogen.sh
+    - ./configure
+    - make --no-print-directory -s pkg-utils pkg-kmod
+    - sudo dpkg -i *.deb
+    - cd ..
+    - sh autogen.sh
+    - ./configure
+    - make --no-print-directory -s pkg-utils pkg-kmod
+    - sudo dpkg -i *.deb
+script:
+    - travis_wait 50 /usr/share/zfs/zfs-tests.sh -v -T $ZFS_TEST_TAGS
+after_failure:
+    - find /var/tmp/test_results/current/log -type f -name '*' -printf "%f\n" -exec cut -c -$ZFS_TEST_TRAVIS_LOG_MAX_LENGTH {} \;
+after_success:
+    - find /var/tmp/test_results/current/log -type f -name '*' -printf "%f\n" -exec cut -c -$ZFS_TEST_TRAVIS_LOG_MAX_LENGTH {} \;

AUTHORS

@@ -10,685 +10,295 @@ PAST MAINTAINERS:
 CONTRIBUTORS:
 
     Aaron Fineman <abyxcos@gmail.com>
-    Adam D. Moss <c@yotes.com>
     Adam Leventhal <ahl@delphix.com>
     Adam Stevko <adam.stevko@gmail.com>
-    adisbladis <adis@blad.is>
-    Adrian Chadd <adrian@freebsd.org>
-    Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
     Ahmed G <ahmedg@delphix.com>
-    Aidan Harris <me@aidanharr.is>
-    AJ Jordan <alex@strugee.net>
-    ajs124 <git@ajs124.de>
     Akash Ayare <aayare@delphix.com>
-    Akash B <akash-b@hpe.com>
     Alan Somers <asomers@gmail.com>
     Alar Aun <spamtoaun@gmail.com>
     Albert Lee <trisk@nexenta.com>
     Alec Salazar <alec.j.salazar@gmail.com>
-    Alejandro Colomar <Colomar.6.4.3@GMail.com>
     Alejandro R. Sedeño <asedeno@mit.edu>
     Alek Pinchuk <alek@nexenta.com>
-    Aleksa Sarai <cyphar@cyphar.com>
-    Alexander Eremin <a.eremin@nexenta.com>
-    Alexander Lobakin <alobakin@pm.me>
-    Alexander Motin <mav@freebsd.org>
-    Alexander Pyhalov <apyhalov@gmail.com>
-    Alexander Richardson <Alexander.Richardson@cl.cam.ac.uk>
-    Alexander Stetsenko <ams@nexenta.com>
-    Alexander Ziaee <ziaee@FreeBSD.org>
     Alex Braunegg <alex.braunegg@gmail.com>
-    Alexey Shvetsov <alexxy@gentoo.org>
-    Alexey Smirnoff <fling@member.fsf.org>
-    Alex John <alex@stty.io>
     Alex McWhirter <alexmcwhirter@triadic.us>
     Alex Reece <alex@delphix.com>
     Alex Wilson <alex.wilson@joyent.com>
     Alex Zhuravlev <alexey.zhuravlev@intel.com>
+    Alexander Eremin <a.eremin@nexenta.com>
+    Alexander Motin <mav@freebsd.org>
+    Alexander Pyhalov <apyhalov@gmail.com>
+    Alexander Stetsenko <ams@nexenta.com>
+    Alexey Shvetsov <alexxy@gentoo.org>
+    Alexey Smirnoff <fling@member.fsf.org>
     Allan Jude <allanjude@freebsd.org>
-    Allen Holl <allen.m.holl@gmail.com>
-    Alphan Yılmaz <alphanyilmaz@gmail.com>
-    alteriks <alteriks@gmail.com>
-    Alyssa Ross <hi@alyssa.is>
-    Ameer Hamza <ahamza@ixsystems.com>
-    Anatoly Borodin <anatoly.borodin@gmail.com>
     AndCycle <andcycle@andcycle.idv.tw>
-    Andrea Gelmini <andrea.gelmini@gelma.net>
-    Andrea Righi <andrea.righi@canonical.com>
     Andreas Buschmann <andreas.buschmann@tech.net.de>
     Andreas Dilger <adilger@intel.com>
-    Andreas Vögele <andreas@andreasvoegele.com>
     Andrew Barnes <barnes333@gmail.com>
     Andrew Hamilton <ahamilto@tjhsst.edu>
-    Andrew Innes <andrew.c12@gmail.com>
-    Andrew J. Hesford <ajh@sideband.org>
     Andrew Reid <ColdCanuck@nailedtotheperch.com>
     Andrew Stormont <andrew.stormont@nexenta.com>
-    Andrew Sun <me@andrewsun.com>
     Andrew Tselischev <andrewtselischev@gmail.com>
-    Andrew Turner <andrew@fubar.geek.nz>
-    Andrew Walker <awalker@ixsystems.com>
-    Andrey Prokopenko <job@terem.fr>
     Andrey Vesnovaty <andrey.vesnovaty@gmail.com>
     Andriy Gapon <avg@freebsd.org>
     Andy Bakun <github@thwartedefforts.org>
-    Andy Fiddaman <omnios@citrus-it.co.uk>
     Aniruddha Shankar <k@191a.net>
-    Anton Gubarkov <anton.gubarkov@gmail.com>
     Antonio Russo <antonio.e.russo@gmail.com>
     Arkadiusz Bubała <arkadiusz.bubala@open-e.com>
-    Armin Wehrfritz <dkxls23@gmail.com>
     Arne Jansen <arne@die-jansens.de>
     Aron Xu <happyaron.xu@gmail.com>
-    Arshad Hussain <arshad.hussain@aeoncomputing.com>
-    Arun KV <arun.kv@datacore.com>
-    Arvind Sankar <nivedita@alum.mit.edu>
-    Attila Fülöp <attila@fueloep.org>
-    Avatat <kontakt@avatat.pl>
     Bart Coddens <bart.coddens@gmail.com>
     Basil Crow <basil.crow@delphix.com>
-    Bassu <bassu@phi9.com>
+    Huang Liu <liu.huang@zte.com.cn>
     Ben Allen <bsallen@alcf.anl.gov>
-    Ben Cordero <bencord0@condi.me>
-    Benda Xu <orv@debian.org>
-    Benedikt Neuffer <github@itfriend.de>
-    Benjamin Albrecht <git@albrecht.io>
-    Benjamin Gentil <benjgentil.pro@gmail.com>
-    Benjamin Sherman <benjamin@holyarmy.org>
-    Ben McGough <bmcgough@fredhutch.org>
     Ben Rubson <ben.rubson@gmail.com>
-    Ben Wolsieffer <benwolsieffer@gmail.com>
-    bernie1995 <bernie.pikes@gmail.com>
+    Benjamin Albrecht <git@albrecht.io>
     Bill McGonigle <bill-github.com-public1@bfccomputing.com>
     Bill Pijewski <wdp@joyent.com>
-    Bojan Novković <bnovkov@FreeBSD.org>
     Boris Protopopov <boris.protopopov@nexenta.com>
-    Brad Forschinger <github@bnjf.id.au>
     Brad Lewis <brad.lewis@delphix.com>
-    Brandon Thetford <brandon@dodecatec.com>
-    Brian Atkinson <bwa@g.clemson.edu>
     Brian Behlendorf <behlendorf1@llnl.gov>
     Brian J. Murrell <brian@sun.com>
-    Brooks Davis <brooks@one-eyed-alien.net>
-    BtbN <btbn@btbn.de>
-    bunder2015 <omfgbunder@gmail.com>
-    buzzingwires <buzzingwires@outlook.com>
-    bzzz77 <bzzz.tomas@gmail.com>
-    cable2999 <cable2999@users.noreply.github.com>
     Caleb James DeLisle <calebdelisle@lavabit.com>
-    Cameron Harr <harr1@llnl.gov>
     Cao Xuewen <cao.xuewen@zte.com.cn>
     Carlo Landmeter <clandmeter@gmail.com>
     Carlos Alberto Lopez Perez <clopez@igalia.com>
-    Cedric Maunoury <cedric.maunoury@gmail.com>
     Chaoyu Zhang <zhang.chaoyu@zte.com.cn>
-    Charles Suh <charles.suh@gmail.com>
     Chen Can <chen.can2@zte.com.cn>
-    Chengfei Zhu <chengfeix.zhu@intel.com>
     Chen Haiquan <oc@yunify.com>
-    ChenHao Lu <18302010006@fudan.edu.cn>
     Chip Parker <aparker@enthought.com>
     Chris Burroughs <chris.burroughs@gmail.com>
-    Chris Davidson <christopher.davidson@gmail.com>
     Chris Dunlap <cdunlap@llnl.gov>
     Chris Dunlop <chris@onthe.net.au>
-    Chris Lindee <chris.lindee+github@gmail.com>
-    Chris McDonough <chrism@plope.com>
-    Chris Peredun <chris.peredun@ixsystems.com>
     Chris Siden <chris.siden@delphix.com>
-    Chris Siebenmann <cks.github@cs.toronto.edu>
+    Chris Wedgwood <cw@f00f.org>
+    Chris Williamson <chris.williamson@delphix.com>
+    Chris Zubrzycki <github@mid-earth.net>
+    Christ Schlacta <aarcane@aarcane.info>
     Christer Ekholm <che@chrekh.se>
     Christian Kohlschütter <christian@kohlschutter.com>
     Christian Neukirchen <chneukirchen@gmail.com>
     Christian Schwarz <me@cschwarz.com>
     Christopher Voltz <cjunk@voltz.ws>
-    Christ Schlacta <aarcane@aarcane.info>
-    Chris Wedgwood <cw@f00f.org>
-    Chris Williamson <chris.williamson@delphix.com>
-    Chris Zubrzycki <github@mid-earth.net>
-    Chuck Tuffli <ctuffli@gmail.com>
     Chunwei Chen <david.chen@nutanix.com>
     Clemens Fruhwirth <clemens@endorphin.org>
-    Clemens Lang <cl@clang.name>
-    Clint Armstrong <clint@clintarmstrong.net>
-    Coleman Kane <ckane@colemankane.org>
     Colin Ian King <colin.king@canonical.com>
-    Colin Percival <cperciva@tarsnap.com>
-    Colm Buckley <colm@tuatha.org>
-    Crag Wang <crag0715@gmail.com>
     Craig Loomis <cloomis@astro.princeton.edu>
     Craig Sanders <github@taz.net.au>
     Cyril Plisko <cyril.plisko@infinidat.com>
-    Cy Schubert <cy@FreeBSD.org>
-    Cédric Berger <cedric@precidata.com>
-    Dacian Reece-Stremtan <dacianstremtan@gmail.com>
-    Dag-Erling Smørgrav <des@FreeBSD.org>
-    Damiano Albani <damiano.albani@gmail.com>
-    Damian Szuberski <szuberskidamian@gmail.com>
+    DHE <git@dehacked.net>
     Damian Wojsław <damian@wojslaw.pl>
-    Daniel Berlin <dberlin@dberlin.org>
-    Daniel Hiepler <d-git@coderdu.de>
-    Daniel Hoffman <dj.hoffman@delphix.com>
-    Daniel Kobras <d.kobras@science-computing.de>
-    Daniel Kolesa <daniel@octaforge.org>
-    Daniel Perry <dtperry@amazon.com>
-    Daniel Reichelt <hacking@nachtgeist.net>
-    Daniel Stevenson <bot@dstev.net>
-    Daniel Verite <daniel@verite.pro>
-    Daniil Lunev <d.lunev.mail@gmail.com>
     Dan Kimmel <dan.kimmel@delphix.com>
     Dan McDonald <danmcd@nexenta.com>
     Dan Swartzendruber <dswartz@druber.com>
     Dan Vatca <dan.vatca@gmail.com>
+    Daniel Hoffman <dj.hoffman@delphix.com>
+    Daniel Verite <daniel@verite.pro>
+    Daniil Lunev <d.lunev.mail@gmail.com>
     Darik Horn <dajhorn@vanadac.com>
     Dave Eddy <dave@daveeddy.com>
-    David Hedberg <david@qzx.se>
     David Lamparter <equinox@diac24.net>
     David Qian <david.qian@intel.com>
     David Quigley <david.quigley@intel.com>
     Debabrata Banerjee <dbanerje@akamai.com>
-    D. Ebdrup <debdrup@freebsd.org>
-    Dennis R. Friedrichsen <dennis.r.friedrichsen@gmail.com>
     Denys Rtveliashvili <denys@rtveliashvili.name>
     Derek Dai <daiderek@gmail.com>
-    Derek Schrock <dereks@lifeofadishwasher.com>
-    Dex Wood <slash2314@gmail.com>
-    DHE <git@dehacked.net>
-    Didier Roche <didrocks@ubuntu.com>
     Dimitri John Ledkov <xnox@ubuntu.com>
-    Dimitry Andric <dimitry@andric.com>
-    Dirkjan Bussink <d.bussink@gmail.com>
     Dmitry Khasanov <pik4ez@gmail.com>
-    Dominic Pearson <dsp@technoanimal.net>
     Dominik Hassler <hadfl@omniosce.org>
     Dominik Honnef <dominikh@fork-bomb.org>
     Don Brady <don.brady@delphix.com>
-    Doug Rabson <dfr@rabson.org>
     Dr. András Korn <korn-github.com@elan.rulez.org>
-    Dries Michiels <driesm.michiels@gmail.com>
-    Edmund Nadolski <edmund.nadolski@ixsystems.com>
-    Eitan Adler <lists@eitanadler.com>
     Eli Rosenthal <eli.rosenthal@delphix.com>
-    Eli Schwartz <eschwartz93@gmail.com>
     Eric Desrochers <eric.desrochers@canonical.com>
     Eric Dillmann <eric@jave.fr>
     Eric Schrock <Eric.Schrock@delphix.com>
-    Ethan Coe-Renner <coerenner1@llnl.gov>
     Etienne Dechamps <etienne@edechamps.fr>
-    Evan Allrich <eallrich@gmail.com>
-    Evan Harris <eharris@puremagic.com>
     Evan Susarret <evansus@gmail.com>
     Fabian Grünbichler <f.gruenbichler@proxmox.com>
-    Fabio Buso <dev.siroibaf@gmail.com>
-    Fabio Scaccabarozzi <fsvm88@gmail.com>
     Fajar A. Nugraha <github@fajar.net>
     Fan Yong <fan.yong@intel.com>
-    fbynite <fbynite@users.noreply.github.com>
-    Fedor Uporov <fuporov.vstack@gmail.com>
-    Felix Dörre <felix@dogcraft.de>
-    Felix Neumärker <xdch47@posteo.de>
     Feng Sun <loyou85@gmail.com>
-    Finix Yan <yancw@info2soft.com>
-    Francesco Mazzoli <f@mazzo.li>
     Frederik Wessels <wessels147@gmail.com>
     Frédéric Vanniere <f.vanniere@planet-work.com>
-    Gabriel A. Devenyi <gdevenyi@gmail.com>
     Garrett D'Amore <garrett@nexenta.com>
-    Garrett Fields <ghfields@gmail.com>
     Garrison Jensen <garrison.jensen@gmail.com>
     Gary Mills <gary_mills@fastmail.fm>
     Gaurav Kumar  <gauravk.18@gmail.com>
     GeLiXin <ge.lixin@zte.com.cn>
     George Amanakis <g_amanakis@yahoo.com>
-    George Diamantopoulos <georgediam@gmail.com>
-    George Gaydarov <git@gg7.io>
     George Melikov <mail@gmelikov.ru>
     George Wilson <gwilson@delphix.com>
     Georgy Yakovlev <ya@sysdump.net>
-    Gerardwx <gerardw@alum.mit.edu>
-    Gian-Carlo DeFazio <defazio1@llnl.gov>
-    Gionatan Danti <g.danti@assyoma.it>
     Giuseppe Di Natale <guss80@gmail.com>
-    Gleb Smirnoff <glebius@FreeBSD.org>
-    Glenn Washburn <development@efficientek.com>
-    glibg10b <glibg10b@users.noreply.github.com>
-    gofaster <felix.gofaster@gmail.com>
     Gordan Bobic <gordan@redsleeve.org>
-    Gordon Bergling <gbergling@googlemail.com>
     Gordon Ross <gwr@nexenta.com>
-    Gordon Tetlow <gordon@freebsd.org>
-    Graham Christensen <graham@grahamc.com>
-    Graham Perrin <grahamperrin@gmail.com>
     Gregor Kopka <gregor@kopka.net>
-    Gregory Bartholomew <gregory.lee.bartholomew@gmail.com>
-    grembo <freebsd@grem.de>
     Grischa Zengel <github.zfsonlinux@zengel.info>
-    grodik <pat@litke.dev>
     Gunnar Beutner <gunnar@beutner.name>
     Gvozden Neskovic <neskovic@gmail.com>
     Hajo Möller <dasjoe@gmail.com>
-    Han Gao <rabenda.cn@gmail.com>
     Hans Rosenfeld <hans.rosenfeld@nexenta.com>
-    Harald van Dijk <harald@gigawatt.nl>
-    Harry Mallon <hjmallon@gmail.com>
-    Harry Sintonen <github-piru@kyber.fi>
-    HC <mmttdebbcc@yahoo.com>
-    hedong zhang <h_d_zhang@163.com>
-    Heitor Alves de Siqueira <halves@canonical.com>
-    Henrik Riomar <henrik.riomar@gmail.com>
-    Herb Wartens <wartens2@llnl.gov>
-    Hiếu Lê <leorize+oss@disroot.org>
-    Huang Liu <liu.huang@zte.com.cn>
     Håkan Johansson <f96hajo@chalmers.se>
-    Igor K <igor@dilos.org>
     Igor Kozhukhov <ikozhukhov@gmail.com>
     Igor Lvovsky <ilvovsky@gmail.com>
-    ilbsmart <wgqimut@gmail.com>
-    Ilkka Sovanto <github@ilkka.kapsi.fi>
-    illiliti <illiliti@protonmail.com>
-    ilovezfs <ilovezfs@icloud.com>
-    InsanePrawn <Insane.Prawny@gmail.com>
     Isaac Huang <he.huang@intel.com>
-    Ivan Volosyuk <Ivan.Volosyuk@gmail.com>
+    JK Dingwall <james@dingwall.me.uk>
     Jacek Fefliński <feflik@gmail.com>
-    Jacob Adams <tookmund@gmail.com>
-    Jake Howard <git@theorangeone.net>
     James Cowgill <james.cowgill@mips.com>
-    James H <james@kagisoft.co.uk>
     James Lee <jlee@thestaticvoid.com>
     James Pan <jiaming.pan@yahoo.com>
-    James Reilly <jreilly1821@gmail.com>
-    James Wah <james@laird-wah.net>
     Jan Engelhardt <jengelh@inai.de>
     Jan Kryl <jan.kryl@nexenta.com>
     Jan Sanislo <oystr@cs.washington.edu>
-    Jaron Kent-Dobias <jaron@kent-dobias.com>
-    Jason Cohen <jwittlincohen@gmail.com>
-    Jason Harmening <jason.harmening@gmail.com>
     Jason King <jason.brian.king@gmail.com>
-    Jason Lee <jasonlee@lanl.gov>
     Jason Zaman <jasonzaman@gmail.com>
     Javen Wu <wu.javen@gmail.com>
-    Jaydeep Kshirsagar <jkshirsagar@maxlinear.com>
-    Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>
-    Jeff Dike <jdike@akamai.com>
-    Jeremy Faulkner <gldisater@gmail.com>
     Jeremy Gill <jgill@parallax-innovations.com>
     Jeremy Jones <jeremy@delphix.com>
-    Jeremy Visser <jeremy.visser@gmail.com>
     Jerry Jelinek <jerry.jelinek@joyent.com>
-    Jerzy Kołosowski <jerzy@kolosowscy.pl>
-    Jessica Clarke <jrtc27@jrtc27.com>
     Jinshan Xiong <jinshan.xiong@intel.com>
-    Jitendra Patidar <jitendra.patidar@nutanix.com>
-    JK Dingwall <james@dingwall.me.uk>
     Joe Stein <joe.stein@delphix.com>
-    John-Mark Gurney <jmg@funkthat.com>
     John Albietz <inthecloud247@gmail.com>
     John Eismeier <john.eismeier@gmail.com>
-    John Gallagher <john.gallagher@delphix.com>
-    John Layman <jlayman@sagecloud.com>
     John L. Hammond <john.hammond@intel.com>
-    John M. Layman <jml@frijid.net>
-    Johnny Stenback <github@jstenback.com>
+    John Layman <jlayman@sagecloud.com>
     John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-    John Poduska <jpoduska@datto.com>
-    John Ramsden <johnramsden@riseup.net>
     John Wren Kennedy <john.kennedy@delphix.com>
-    jokersus <lolivampireslave@gmail.com>
-    Jonathon Fernyhough <jonathon@m2x.dev>
+    Johnny Stenback <github@jstenback.com>
     Jorgen Lundman <lundman@lundman.net>
     Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
-    Jose Luis Duran <jlduran@gmail.com>
-    Josh Soref <jsoref@users.noreply.github.com>
     Joshua M. Clulow <josh@sysmgr.org>
-    José Luis Salvador Rufo <salvador.joseluis@gmail.com>
-    João Carlos Mendes Luís <jonny@jonny.eng.br>
-    Julian Brunner <julian.brunner@gmail.com>
-    Julian Heuking <JulianH@beckhoff.com>
-    jumbi77 <jumbi77@users.noreply.github.com>
     Justin Bedő <cu@cua0.org>
-    Justin Gottula <justin@jgottula.com>
-    Justin Hibbits <chmeeedalf@gmail.com>
-    Justin Keogh <github.com@v6y.net>
     Justin Lecher <jlec@gentoo.org>
-    Justin Scholz <git@justinscholz.de>
     Justin T. Gibbs <gibbs@FreeBSD.org>
-    jyxent <jordanp@gmail.com>
     Jörg Thalheim <joerg@higgsboson.tk>
-    ka7 <ka7@la-evento.com>
-    Ka Ho Ng <khng@FreeBSD.org>
+    KORN Andras <korn@elan.rulez.org>
     Kamil Domański <kamil@domanski.co>
     Karsten Kretschmer <kkretschmer@gmail.com>
     Kash Pande <kash@tripleback.net>
-    Kay Pedersen <christianpe96@gmail.com>
     Keith M Wesolowski <wesolows@foobazco.org>
-    Kent Ross <k@mad.cash>
-    KernelOfTruth <kerneloftruth@gmail.com>
-    Kevin Bowling <kevin.bowling@kev009.com>
-    Kevin Greene <kevin.greene@delphix.com>
-    Kevin Jin <lostking2008@hotmail.com>
-    Kevin P. Fleming <kevin@km6g.us>
     Kevin Tanguy <kevin.tanguy@ovh.net>
     KireinaHoro <i@jsteward.moe>
-    Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
-    Kleber Tarcísio <klebertarcisio@yahoo.com.br>
-    Kody A Kantor <kody.kantor@gmail.com>
     Kohsuke Kawaguchi <kk@kohsuke.org>
-    Konstantin Khorenko <khorenko@virtuozzo.com>
-    KORN Andras <korn@elan.rulez.org>
-    kotauskas <v.toncharov@gmail.com>
-    Kristof Provost <github@sigsegv.be>
-    Krzysztof Piecuch <piecuch@kpiecuch.pl>
     Kyle Blatter <kyleblatter@llnl.gov>
-    Kyle Evans <kevans@FreeBSD.org>
     Kyle Fuller <inbox@kylefuller.co.uk>
-    Laevos <Laevos@users.noreply.github.com>
-    Lalufu <Lalufu@users.noreply.github.com>
-    Lars Johannsen <laj@it.dk>
-    Laura Hild <lsh@jlab.org>
-    Laurențiu Nicola <lnicola@dend.ro>
-    Lauri Tirkkonen <lauri@hacktheplanet.fi>
-    liaoyuxiangqin <guo.yong33@zte.com.cn>
-    Li Dongyang <dongyang.li@anu.edu.au>
-    Liu Hua <liu.hua130@zte.com.cn>
-    Liu Qing <winglq@gmail.com>
-    Li Wei <W.Li@Sun.COM>
     Loli <ezomori.nozomu@gmail.com>
-    lorddoskias <lorddoskias@gmail.com>
-    Lorenz Brun <lorenz@dolansoft.org>
-    Lorenz Hüdepohl <dev@stellardeath.org>
-    louwrentius <louwrentius@gmail.com>
+    Lars Johannsen <laj@it.dk>
+    Li Dongyang <dongyang.li@anu.edu.au>
+    Li Wei <W.Li@Sun.COM>
     Lukas Wunner <lukas@wunner.de>
-    luozhengzheng <luo.zhengzheng@zte.com.cn>
-    Luís Henriques <henrix@camandro.org>
     Madhav Suresh <madhav.suresh@delphix.com>
-    manfromafar <jonsonb10@gmail.com>
     Manoj Joseph <manoj.joseph@delphix.com>
     Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
     Marcel Huber <marcelhuberfoo@gmail.com>
-    Marcel Menzel <mail@mcl.gg>
-    Marcel Schilling <marcel.schilling@uni-luebeck.de>
     Marcel Telka <marcel.telka@nexenta.com>
     Marcel Wysocki <maci.stgn@gmail.com>
-    Marcin Skarbek <git@skarbek.name>
-    Mariusz Zaborski <mariusz.zaborski@klarasystems.com>
-    Mark Johnston <markj@FreeBSD.org>
-    Mark Maybee <mark.maybee@delphix.com>
-    Mark Roper <markroper@gmail.com>
     Mark Shellenbaum <Mark.Shellenbaum@Oracle.COM>
-    marku89 <mar42@kola.li>
     Mark Wright <markwright@internode.on.net>
-    Mart Frauenlob <allkind@fastest.cc>
     Martin Matuska <mm@FreeBSD.org>
-    Martin Rüegg <martin.rueegg@metaworx.ch>
-    Martin Wagner <martin.wagner.dev@gmail.com>
     Massimo Maggi <me@massimo-maggi.eu>
-    Mateusz Guzik <mjguzik@gmail.com>
-    Mateusz Piotrowski <0mp@FreeBSD.org>
-    Mathieu Velten <matmaul@gmail.com>
-    Matt Fiddaman <github@m.fiddaman.uk>
-    Matthew Ahrens <matt@delphix.com>
-    Matthew Heller <matthew.f.heller@gmail.com>
-    Matthew Thode <mthode@mthode.org>
-    Matthias Blankertz <matthias@blankertz.org>
     Matt Johnston <matt@fugro-fsi.com.au>
     Matt Kemp <matt@mattikus.com>
-    Matt Macy <mmacy@freebsd.org>
+    Matthew Ahrens <matt@delphix.com>
+    Matthew Thode <mthode@mthode.org>
     Matus Kral <matuskral@me.com>
-    Mauricio Faria de Oliveira <mfo@canonical.com>
     Max Grossman <max.grossman@delphix.com>
-    Maxim Filimonov <che@bein.link>
     Maximilian Mehnert <maximilian.mehnert@gmx.de>
-    Max Zettlmeißl <max@zettlmeissl.de>
-    Md Islam <mdnahian@outlook.com>
-    megari <megari@iki.fi>
-    Michael D Labriola <michael.d.labriola@gmail.com>
-    Michael Franzl <michael@franzl.name>
     Michael Gebetsroither <michael@mgeb.org>
     Michael Kjorling <michael@kjorling.se>
     Michael Martin <mgmartin.mgm@gmail.com>
-    Michael Niewöhner <foss@mniewoehner.de>
-    Michael Zhivich <mzhivich@akamai.com>
-    Michal Vasilek <michal@vasilek.cz>
-    MigeljanImeri <ImeriMigel@gmail.com>
     Mike Gerdts <mike.gerdts@joyent.com>
     Mike Harsch <mike@harschsystems.com>
     Mike Leddy <mike.leddy@gmail.com>
     Mike Swanson <mikeonthecomputer@gmail.com>
     Milan Jurik <milan.jurik@xylab.cz>
-    Minsoo Choo <minsoochoo0122@proton.me>
-    mnrx <mnrx@users.noreply.github.com>
-    Mohamed Tawfik <m_tawfik@aucegypt.edu>
     Morgan Jones <mjones@rice.edu>
     Moritz Maxeiner <moritz@ucworks.org>
-    Mo Zhou <cdluminate@gmail.com>
-    naivekun <naivekun@outlook.com>
-    nathancheek <myself@nathancheek.com>
     Nathaniel Clark <Nathaniel.Clark@misrule.us>
     Nathaniel Wesley Filardo <nwf@cs.jhu.edu>
-    Nathan Lewis <linux.robotdude@gmail.com>
     Nav Ravindranath <nav@delphix.com>
     Neal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>
     Ned Bass <bass6@llnl.gov>
     Neependra Khare <neependra@kqinfotech.com>
     Neil Stockbridge <neil@dist.ro>
-    Nick Black <dank@qemfd.net>
     Nick Garvey <garvey.nick@gmail.com>
-    Nick Mattis <nickm970@gmail.com>
-    Nick Terrell <terrelln@fb.com>
-    Niklas Haas <github-c6e1c8@haasn.xyz>
     Nikolay Borisov <n.borisov.lkml@gmail.com>
-    nordaux <nordaux@gmail.com>
-    ofthesun9 <olivier@ofthesun.net>
     Olaf Faaland <faaland1@llnl.gov>
     Oleg Drokin <green@linuxhacker.ru>
     Oleg Stepura <oleg@stepura.com>
-    Olivier Certner <olce.freebsd@certner.fr>
-    Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
-    omni <omni+vagant@hack.org>
-    Orivej Desh <orivej@gmx.fr>
-    Pablo Correa Gómez <ablocorrea@hotmail.com>
-    Palash Gandhi <pbg4930@rit.edu>
-    Patrick Mooney <pmooney@pfmooney.com>
     Patrik Greco <sikevux@sikevux.se>
     Paul B. Henson <henson@acm.org>
     Paul Dagnelie <pcd@delphix.com>
     Paul Zuchowski <pzuchowski@datto.com>
     Pavel Boldin <boldin.pavel@gmail.com>
-    Pavel Snajdr <snajpa@snajpa.net>
     Pavel Zakharov <pavel.zakharov@delphix.com>
     Pawel Jakub Dawidek <pjd@FreeBSD.org>
     Pedro Giffuni <pfg@freebsd.org>
     Peng <peng.hse@xtaotech.com>
-    Peng Liu <littlenewton6@gmail.com>
     Peter Ashford <ashford@accs.com>
-    Peter Dave Hello <hsu@peterdavehello.org>
-    Peter Doherty <peterd@acranox.org>
-    Peter Levine <plevine457@gmail.com>
-    Peter Wirdemo <peter.wirdemo@gmail.com>
-    Petros Koutoupis <petros@petroskoutoupis.com>
-    Philip Pokorny <ppokorny@penguincomputing.com>
-    Philipp Riederer <pt@philipptoelke.de>
-    Phil Kauffman <philip@kauffman.me>
-    Phil Sutter <phil@nwl.cc>
-    Ping Huang <huangping@smartx.com>
-    Piotr Kubaj <pkubaj@anongoth.pl>
-    Piotr P. Stefaniak <pstef@freebsd.org>
-    poscat <poscat@poscat.moe>
     Prakash Surya <prakash.surya@delphix.com>
     Prasad Joshi <prasadjoshi124@gmail.com>
-    privb0x23 <privb0x23@users.noreply.github.com>
-    P.SCH <p88@yahoo.com>
-    Qiuhao Chen <chenqiuhao1997@gmail.com>
-    Quartz <yyhran@163.com>
-    Quentin Zdanis <zdanisq@gmail.com>
-    Rafael Kitover <rkitover@gmail.com>
-    RageLtMan <sempervictus@users.noreply.github.com>
     Ralf Ertzinger <ralf@skytale.net>
     Randall Mason <ClashTheBunny@gmail.com>
     Remy Blank <remy.blank@pobox.com>
-    renelson <bnelson@nelsonbe.com>
-    Reno Reckling <e-github@wthack.de>
     Ricardo M. Correia <ricardo.correia@oracle.com>
-    Riccardo Schirone <rschirone91@gmail.com>
-    Richard Allen <belperite@gmail.com>
+    Rich Ercolani <rincebrain@gmail.com>
     Richard Elling <Richard.Elling@RichardElling.com>
-    Richard Kojedzinszky <richard@kojedz.in>
     Richard Laager <rlaager@wiktel.com>
     Richard Lowe <richlowe@richlowe.net>
     Richard Sharpe <rsharpe@samba.org>
     Richard Yao <ryao@gentoo.org>
-    Rich Ercolani <rincebrain@gmail.com>
-    Rick Macklem <rmacklem@uoguelph.ca>
-    rilysh <nightquick@proton.me>
-    Robert Evans <evansr@google.com>
-    Robert Novak <sailnfool@gmail.com>
-    Roberto Ricci <ricci@disroot.org>
-    Rob Norris <robn@despairlabs.com>
-    Rob Wing <rew@FreeBSD.org>
     Rohan Puri <rohan.puri15@gmail.com>
     Romain Dolbeau <romain.dolbeau@atos.net>
     Roman Strashkin <roman.strashkin@nexenta.com>
-    Ross Williams <ross@ross-williams.net>
     Ruben Kerkhof <ruben@rubenkerkhof.com>
-    Ryan <errornointernet@envs.net>
-    Ryan Hirasaki <ryanhirasaki@gmail.com>
-    Ryan Lahfa <masterancpp@gmail.com>
-    Ryan Libby <rlibby@FreeBSD.org>
-    Ryan Moeller <freqlabs@FreeBSD.org>
-    Sam Atkinson <samatk@amazon.com>
-    Sam Hathaway <github.com@munkynet.org>
-    Sam James <sam@gentoo.org>
-    Sam Lunt <samuel.j.lunt@gmail.com>
-    Samuel VERSCHELDE <stormi-github@ylix.fr>
-    Samuel Wycliffe <samuelwycliffe@gmail.com>
-    Samuel Wycliffe J <samwyc@hpe.com>
-    Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com>
-    Sara Hartse <sara.hartse@delphix.com>
     Saso Kiselkov <saso.kiselkov@nexenta.com>
-    Satadru Pramanik <satadru@gmail.com>
-    Savyasachee Jha <genghizkhan91@hawkradius.com>
-    Scott Colby <scott@scolby.com>
     Scot W. Stevenson <scot.stevenson@gmail.com>
     Sean Eric Fagan <sef@ixsystems.com>
-    Sebastian Gottschall <s.gottschall@dd-wrt.com>
-    Sebastian Wuerl <s.wuerl@mailbox.org>
-    Sebastien Roy <seb@delphix.com>
     Sen Haerens <sen@senhaerens.be>
     Serapheim Dimitropoulos <serapheim@delphix.com>
     Seth Forshee <seth.forshee@canonical.com>
-    Seth Hoffert <Seth.Hoffert@gmail.com>
-    Seth Troisi <sethtroisi@google.com>
-    Shaan Nobee <sniper111@gmail.com>
     Shampavman <sham.pavman@nexenta.com>
-    Shaun Tancheff <shaun@aeonazure.com>
-    Shawn Bayern <sbayern@law.fsu.edu>
-    Shengqi Chen <harry-chen@outlook.com>
-    SHENGYI HONG <aokblast@FreeBSD.org>
     Shen Yan <shenyanxxxy@qq.com>
-    Sietse <sietse@wizdom.nu>
     Simon Guest <simon.guest@tesujimath.org>
     Simon Klinkert <simon.klinkert@gmail.com>
     Sowrabha Gopal <sowrabha.gopal@delphix.com>
-    Spencer Kinny <spencerkinny1995@gmail.com>
-    Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com>
     Stanislav Seletskiy <s.seletskiy@gmail.com>
-    Stefan Lendl <s.lendl@proxmox.com>
     Steffen Müthing <steffen.muething@iwr.uni-heidelberg.de>
     Stephen Blinick <stephen.blinick@delphix.com>
-    sterlingjensen <sterlingjensen@users.noreply.github.com>
     Steve Dougherty <sdougherty@barracuda.com>
-    Steve Mokris <smokris@softpixel.com>
     Steven Burgess <sburgess@dattobackup.com>
     Steven Hartland <smh@freebsd.org>
     Steven Johnson <sjohnson@sakuraindustries.com>
-    Steven Noonan <steven@uplinklabs.net>
-    stf <s@ctrlc.hu>
     Stian Ellingsen <stian@plaimi.net>
-    Stoiko Ivanov <github@nomore.at>
-    Stéphane Lesimple <speed47_github@speed47.net>
     Suman Chakravartula <schakrava@gmail.com>
     Sydney Vanda <sydney.m.vanda@intel.com>
     Sören Tempel <soeren+git@soeren-tempel.net>
-    Tamas TEVESZ <ice@extreme.hu>
-    Teodor Spæren <teodor_spaeren@riseup.net>
-    TerraTech <TerraTech@users.noreply.github.com>
-    Theera K. <tkittich@hotmail.com>
     Thijs Cramer <thijs.cramer@gmail.com>
-    Thomas Bertschinger <bertschinger@lanl.gov>
-    Thomas Geppert <geppi@digitx.de>
-    Thomas Lamprecht <guggentom@hotmail.de>
-    Till Maas <opensource@till.name>
     Tim Chase <tim@chase2k.com>
     Tim Connors <tconnors@rather.puzzling.org>
     Tim Crawford <tcrawford@datto.com>
     Tim Haley <Tim.Haley@Sun.COM>
-    timor <timor.dd@googlemail.com>
-    Timothy Day <tday141@gmail.com>
-    Tim Schumacher <timschumi@gmx.de>
-    Tim Smith <tim@mondoo.com>
-    Tino Reichardt <milky-zfs@mcmilk.de>
-    tleydxdy <shironeko.github@tesaguri.club>
     Tobin Harding <me@tobin.cc>
-    Todd Seidelmann <seidelma@users.noreply.github.com>
     Tom Caputi <tcaputi@datto.com>
     Tom Matthews <tom@axiom-partners.com>
-    Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
     Tom Prince <tom.prince@ualberta.net>
+    Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
     Tony Hutter <hutter2@llnl.gov>
-    Tony Nguyen <tony.nguyen@delphix.com>
-    Tony Perkins <tperkins@datto.com>
     Toomas Soome <tsoome@me.com>
-    Torsten Wörtwein <twoertwein@gmail.com>
-    Toyam Cox <aviator45003@gmail.com>
-    Trevor Bautista <trevrb@trevrb.net>
     Trey Dockendorf <treydock@gmail.com>
-    Troels Nørgaard <tnn@tradeshift.com>
-    tstabrawa <tstabrawa@users.noreply.github.com>
-    Tulsi Jain <tulsi.jain@delphix.com>
     Turbo Fredriksson <turbo@bayour.com>
     Tyler J. Stachecki <stachecki.tyler@gmail.com>
-    Umer Saleem <usaleem@ixsystems.com>
-    Vaibhav Bhanawat <vaibhav.bhanawat@delphix.com>
-    Valmiky Arquissandas <kayvlim@gmail.com>
-    Val Packett <val@packett.cool>
-    Vandana Rungta <vrungta@amazon.com>
-    Vince van Oosten <techhazard@codeforyouand.me>
-    Violet Purcell <vimproved@inventati.org>
-    Vipin Kumar Verma <vipin.verma@hpe.com>
     Vitaut Bajaryn <vitaut.bayaryn@gmail.com>
-    Volker Mauel <volkermauel@gmail.com>
-    Václav Skála <skala@vshosting.cz>
-    Walter Huf <hufman@gmail.com>
-    Warner Losh <imp@bsdimp.com>
     Weigang Li <weigang.li@intel.com>
-    WHR <msl0000023508@gmail.com>
     Will Andrews <will@freebsd.org>
     Will Rouesnel <w.rouesnel@gmail.com>
-    Windel Bouwman <windel@windel.nl>
-    Wojciech Małota-Wójcik <outofforest@users.noreply.github.com>
     Wolfgang Bumiller <w.bumiller@proxmox.com>
-    XDTG <click1799@163.com>
     Xin Li <delphij@FreeBSD.org>
-    Xinliang Liu <xinliang.liu@linaro.org>
-    xtouqh <xtouqh@hotmail.com>
-    Yann Collet <cyan@fb.com>
-    Yanping Gao <yanping.gao@xtaotech.com>
     Ying Zhu <casualfisher@gmail.com>
-    Youzhong Yang <youzhong@gmail.com>
-    yparitcher <y@paritcher.com>
-    yuina822 <ayuichi@club.kyutech.ac.jp>
     YunQiang Su <syq@debian.org>
     Yuri Pankov <yuri.pankov@gmail.com>
-    Yuxin Wang <yuxinwang9999@gmail.com>
     Yuxuan Shui <yshuiv7@gmail.com>
     Zachary Bedell <zac@thebedells.org>
-    Zach Dykstra <dykstra.zachary@gmail.com>
-    zgock <zgock@nuc.base.zgock-lab.net>
-    Zhao Yongming <zym@apache.org>
-    Zhenlei Huang <zlei@FreeBSD.org>
-    Zhu Chuang <chuang@melty.land>
-    Érico Nogueira <erico.erc@gmail.com>
-    Đoàn Trần Công Danh <congdanhqx@gmail.com>
-    韩朴宇 <w12101111@gmail.com>

CODE_OF_CONDUCT.md

@@ -1,2 +1,2 @@
-The [OpenZFS Code of Conduct](https://openzfs.org/wiki/Code_of_Conduct)
-applies to spaces associated with the OpenZFS project, including GitHub.
+The [OpenZFS Code of Conduct](http://www.open-zfs.org/wiki/Code_of_Conduct)
+applies to spaces associated with the ZFS on Linux project, including GitHub.

COPYRIGHT

@@ -19,11 +19,7 @@ notable exceptions and their respective licenses include:
   * AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman
   * AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
   * PBKDF2 Implementation: lib/libzfs/THIRDPARTYLICENSE.openssl
-  * SPL Implementation: module/os/linux/spl/THIRDPARTYLICENSE.gplv2
-  * GCM Implementation: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
-  * GCM Implementation: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
-  * GHASH Implementation: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
-  * GHASH Implementation: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
+  * SPL Implementation: module/spl/THIRDPARTYLICENSE.gplv2
 
 This product includes software developed by the OpenSSL Project for use
 in the OpenSSL Toolkit (http://www.openssl.org/)

META

@@ -1,10 +1,10 @@
 Meta:          1
 Name:          zfs
 Branch:        1.0
-Version:       2.3.2
+Version:       0.8.1
 Release:       1
 Release-Tags:  relext
 License:       CDDL
-Author:        OpenZFS
-Linux-Maximum: 6.14
-Linux-Minimum: 4.18
+Author:        OpenZFS on Linux
+Linux-Maximum: 5.1
+Linux-Minimum: 2.6.32

Makefile.am

@@ -1,83 +1,46 @@
-CLEANFILES =
-dist_noinst_DATA =
-INSTALL_DATA_HOOKS =
-ALL_LOCAL =
-CLEAN_LOCAL =
-CHECKS = shellcheck checkbashisms
-
-include $(top_srcdir)/config/Rules.am
-include $(top_srcdir)/config/CppCheck.am
-include $(top_srcdir)/config/Shellcheck.am
-include $(top_srcdir)/config/Substfiles.am
-include $(top_srcdir)/scripts/Makefile.am
-
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = include
-if BUILD_LINUX
-include $(srcdir)/%D%/rpm/Makefile.am
-endif
+include config/rpm.am
+include config/deb.am
+include config/tgz.am
 
+SUBDIRS = include rpm
 if CONFIG_USER
-include $(srcdir)/%D%/cmd/Makefile.am
-include $(srcdir)/%D%/contrib/Makefile.am
-include $(srcdir)/%D%/etc/Makefile.am
-include $(srcdir)/%D%/lib/Makefile.am
-include $(srcdir)/%D%/man/Makefile.am
-include $(srcdir)/%D%/tests/Makefile.am
-if BUILD_LINUX
-include $(srcdir)/%D%/udev/Makefile.am
+SUBDIRS += udev etc man scripts lib tests cmd contrib
 endif
-endif
-CPPCHECKDIRS += module
 if CONFIG_KERNEL
 SUBDIRS += module
 
 extradir = $(prefix)/src/zfs-$(VERSION)
 extra_HEADERS = zfs.release.in zfs_config.h.in
+
+kerneldir = $(prefix)/src/zfs-$(VERSION)/$(LINUX_VERSION)
+nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
 endif
 
-dist_noinst_DATA += autogen.sh copy-builtin
-dist_noinst_DATA += AUTHORS CODE_OF_CONDUCT.md COPYRIGHT LICENSE META NEWS NOTICE
-dist_noinst_DATA += README.md RELEASES.md
-dist_noinst_DATA += module/lua/README.zfs module/os/linux/spl/README.md
+AUTOMAKE_OPTIONS = foreign
+EXTRA_DIST  = autogen.sh copy-builtin
+EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
+EXTRA_DIST += META AUTHORS COPYRIGHT LICENSE NEWS NOTICE README.md
+EXTRA_DIST += CODE_OF_CONDUCT.md
 
 # Include all the extra licensing information for modules
-dist_noinst_DATA += module/icp/algs/skein/THIRDPARTYLICENSE
-dist_noinst_DATA += module/icp/algs/skein/THIRDPARTYLICENSE.descrip
-dist_noinst_DATA += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman
-dist_noinst_DATA += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman.descrip
-dist_noinst_DATA += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
-dist_noinst_DATA += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl.descrip
-dist_noinst_DATA += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
-dist_noinst_DATA += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams.descrip
-dist_noinst_DATA += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
-dist_noinst_DATA += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl.descrip
-dist_noinst_DATA += module/os/linux/spl/THIRDPARTYLICENSE.gplv2
-dist_noinst_DATA += module/os/linux/spl/THIRDPARTYLICENSE.gplv2.descrip
-dist_noinst_DATA += module/zfs/THIRDPARTYLICENSE.cityhash
-dist_noinst_DATA += module/zfs/THIRDPARTYLICENSE.cityhash.descrip
+EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE module/icp/algs/skein/THIRDPARTYLICENSE.descrip
+EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman.descrip
+EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl.descrip
+EXTRA_DIST += module/spl/THIRDPARTYLICENSE.gplv2 module/spl/THIRDPARTYLICENSE.gplv2.descrip
+EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash module/zfs/THIRDPARTYLICENSE.cityhash.descrip
 
 @CODE_COVERAGE_RULES@
 
-GITREV = include/zfs_gitrev.h
-CLEANFILES += $(GITREV)
-PHONY += gitrev
+.PHONY: gitrev
 gitrev:
-	$(AM_V_GEN)$(top_srcdir)/scripts/make_gitrev.sh $(GITREV)
+	-${top_srcdir}/scripts/make_gitrev.sh
 
-all: gitrev
+BUILT_SOURCES = gitrev
 
-PHONY += install-data-hook $(INSTALL_DATA_HOOKS)
-install-data-hook: $(INSTALL_DATA_HOOKS)
-
-PHONY += maintainer-clean-local
-maintainer-clean-local:
-	-$(RM) $(GITREV)
-
-PHONY += distclean-local
-distclean-local:
-	-$(RM) -R autom4te*.cache build
+distclean-local::
+	-$(RM) -R autom4te*.cache
 	-find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
 		-o -name .pc -o -name .hg -o -name .git \) -prune -o \
 		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
@@ -86,126 +49,119 @@ distclean-local:
 		-o -name 'core' -o -name 'Makefile' -o -name 'Module.symvers' \
 		-o -name '*.order' -o -name '*.markers' -o -name '*.gcda' \
 		-o -name '*.gcno' \) \
-		-type f -delete
+		-type f -print | xargs $(RM)
 
-PHONY += $(CLEAN_LOCAL)
-clean-local: $(CLEAN_LOCAL)
+all-local:
+	-${top_srcdir}/scripts/zfs-tests.sh -c
 
-PHONY += $(ALL_LOCAL)
-all-local: $(ALL_LOCAL)
+dist-hook: gitrev
+	cp ${top_srcdir}/include/zfs_gitrev.h $(distdir)/include; \
+	sed -i 's/Release:[[:print:]]*/Release:      $(RELEASE)/' \
+		$(distdir)/META
 
-dist-hook:
-	$(top_srcdir)/scripts/make_gitrev.sh -D $(distdir) $(GITREV)
-	$(SED) $(ac_inplace) 's/\(Release:[[:space:]]*\).*/\1$(RELEASE)/' $(distdir)/META
+# For compatibility, create a matching spl-x.y.z directly which contains
+# symlinks to the updated header and object file locations.  These
+# compatibility links will be removed in the next major release.
+if CONFIG_KERNEL
+install-data-hook:
+	rm -rf $(DESTDIR)$(prefix)/src/spl-$(VERSION) && \
+	mkdir $(DESTDIR)$(prefix)/src/spl-$(VERSION) && \
+	cd $(DESTDIR)$(prefix)/src/spl-$(VERSION) && \
+	ln -s ../zfs-$(VERSION)/include/spl include && \
+	ln -s ../zfs-$(VERSION)/$(LINUX_VERSION) $(LINUX_VERSION) && \
+	ln -s ../zfs-$(VERSION)/zfs_config.h.in spl_config.h.in && \
+	ln -s ../zfs-$(VERSION)/zfs.release.in spl.release.in && \
+	cd $(DESTDIR)$(prefix)/src/zfs-$(VERSION)/$(LINUX_VERSION) && \
+	ln -fs zfs_config.h spl_config.h && \
+	ln -fs zfs.release spl.release
+endif
 
-PHONY += codecheck $(CHECKS)
-codecheck: $(CHECKS)
+codecheck: cstyle shellcheck flake8 mancheck testscheck vcscheck
 
-SHELLCHECKSCRIPTS += autogen.sh
-
-PHONY += checkstyle
 checkstyle: codecheck commitcheck
 
-PHONY += commitcheck
 commitcheck:
-	$(AM_V_at)if git rev-parse --git-dir > /dev/null 2>&1; then \
+	@if git rev-parse --git-dir > /dev/null 2>&1; then \
 		${top_srcdir}/scripts/commitcheck.sh; \
 	fi
 
-CHECKS += spdxcheck
-spdxcheck:
-	$(AM_V_at)$(top_srcdir)/scripts/spdxcheck.pl
-
-if HAVE_PARALLEL
-cstyle_line = -print0 | parallel -X0 ${top_srcdir}/scripts/cstyle.pl -cpP {}
-else
-cstyle_line = -exec ${top_srcdir}/scripts/cstyle.pl -cpP {} +
-endif
-CHECKS += cstyle
 cstyle:
-	$(AM_V_at)find $(top_srcdir) -name build -prune \
-		-o -type f -name '*.[hc]' \
-		! -name 'zfs_config.*' ! -name '*.mod.c' \
-		! -name 'opt_global.h' ! -name '*_if*.h' \
-		! -name 'zstd_compat_wrapper.h' \
-		! -path './module/zstd/lib/*' \
-		! -path './include/sys/lua/*' \
-		! -path './module/lua/l*.[ch]' \
-		! -path './module/zfs/lz4.c' \
-		$(cstyle_line)
+	@find ${top_srcdir} -name '*.[hc]' ! -name 'zfs_config.*' \
+		! -name '*.mod.c' -type f \
+		-exec ${top_srcdir}/scripts/cstyle.pl -cpP {} \+
+
+shellcheck:
+	@if type shellcheck > /dev/null 2>&1; then \
+		shellcheck --exclude=SC1090 --format=gcc \
+			$$(find ${top_srcdir}/scripts/*.sh -type f) \
+			$$(find ${top_srcdir}/cmd/zed/zed.d/*.sh -type f) \
+			$$(find ${top_srcdir}/cmd/zpool/zpool.d/* -executable); \
+	else \
+		echo "skipping shellcheck because shellcheck is not installed"; \
+	fi
+
+mancheck:
+	@if type mandoc > /dev/null 2>&1; then \
+		find ${top_srcdir}/man/man8 -type f -name 'zfs.8' \
+			-o -name 'zpool.8' -o -name 'zdb.8' \
+			-o -name 'zgenhostid.8' | \
+			xargs mandoc -Tlint -Werror; \
+	else \
+		echo "skipping mancheck because mandoc is not installed"; \
+	fi
 
-filter_executable = -exec test -x '{}' \; -print
-CHECKS += testscheck
 testscheck:
-	$(AM_V_at)[ $$(find $(top_srcdir)/tests/zfs-tests -type f \
-		\( -name '*.ksh' -not $(filter_executable) \) -o \
-		\( -name '*.kshlib' $(filter_executable) \) -o \
-		\( -name '*.shlib' $(filter_executable) \) -o \
-		\( -name '*.cfg' $(filter_executable) \) | \
-		tee /dev/stderr | wc -l) -eq 0 ]
+	@find ${top_srcdir}/tests/zfs-tests -type f \
+		\( -name '*.ksh' -not -executable \) -o \
+		\( -name '*.kshlib' -executable \) -o \
+		\( -name '*.shlib' -executable \) -o \
+		\( -name '*.cfg' -executable \) | \
+		xargs -r stat -c '%A %n' | \
+		awk '{c++; print} END {if(c>0) exit 1}'
 
-CHECKS += vcscheck
 vcscheck:
-	$(AM_V_at)if git rev-parse --git-dir > /dev/null 2>&1; then \
+	@if git rev-parse --git-dir > /dev/null 2>&1; then \
 		git ls-files . --exclude-standard --others | \
 		awk '{c++; print} END {if(c>0) exit 1}' ; \
 	fi
 
-CHECKS += zstdcheck
-zstdcheck:
-	@$(MAKE) -C module check-zstd-symbols
-
-PHONY += lint
 lint: cppcheck paxcheck
 
-PHONY += paxcheck
+cppcheck:
+	@if type cppcheck > /dev/null 2>&1; then \
+		cppcheck --quiet --force --error-exitcode=2 --inline-suppr \
+			--suppressions-list=.github/suppressions.txt \
+			-UHAVE_SSE2 -UHAVE_AVX512F -UHAVE_UIO_ZEROCOPY \
+			${top_srcdir}; \
+	else \
+		echo "skipping cppcheck because cppcheck is not installed"; \
+	fi
+
 paxcheck:
-	$(AM_V_at)if type scanelf > /dev/null 2>&1; then \
-		$(top_srcdir)/scripts/paxcheck.sh $(top_builddir); \
+	@if type scanelf > /dev/null 2>&1; then \
+		${top_srcdir}/scripts/paxcheck.sh ${top_srcdir}; \
 	else \
 		echo "skipping paxcheck because scanelf is not installed"; \
 	fi
 
-CHECKS += flake8
 flake8:
-	$(AM_V_at)if type flake8 > /dev/null 2>&1; then \
-		flake8 $(top_srcdir); \
+	@if type flake8 > /dev/null 2>&1; then \
+		flake8 ${top_srcdir}; \
 	else \
 		echo "skipping flake8 because flake8 is not installed"; \
 	fi
 
-PHONY += regen-tests
-regen-tests:
-	@$(MAKE) -C tests/zfs-tests/tests regen
-
-PHONY += ctags
 ctags:
 	$(RM) tags
-	find $(top_srcdir) -name '.?*' -prune \
-		-o -type f -name '*.[hcS]' -exec ctags -a {} +
+	find $(top_srcdir) -name .git -prune -o -name '*.[hc]' | xargs ctags
 
-PHONY += etags
 etags:
 	$(RM) TAGS
-	find $(top_srcdir) -name '.?*' -prune \
-		-o -type f -name '*.[hcS]' -exec etags -a {} +
+	find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' | xargs etags -a
 
-PHONY += cscopelist
-cscopelist:
-	find $(top_srcdir) -name '.?*' -prune \
-		-o -type f -name '*.[hc]' -print >cscope.files
-
-PHONY += tags
 tags: ctags etags
 
-PHONY += pkg pkg-dkms pkg-kmod pkg-utils
 pkg: @DEFAULT_PACKAGE@
 pkg-dkms: @DEFAULT_PACKAGE@-dkms
 pkg-kmod: @DEFAULT_PACKAGE@-kmod
 pkg-utils: @DEFAULT_PACKAGE@-utils
-
-include config/rpm.am
-include config/deb.am
-include config/tgz.am
-
-.PHONY: $(PHONY)

NEWS

@@ -1,3 +1,3 @@
 Descriptions of all releases can be found on github:
 
-https://github.com/openzfs/zfs/releases
+https://github.com/zfsonlinux/zfs/releases

README.md

@@ -1,35 +1,31 @@
-![img](https://openzfs.github.io/openzfs-docs/_static/img/logo/480px-Open-ZFS-Secondary-Logo-Colour-halfsize.png)
+![img](http://zfsonlinux.org/images/zfs-linux.png)
 
-OpenZFS is an advanced file system and volume manager which was originally
+ZFS on Linux is an advanced file system and volume manager which was originally
 developed for Solaris and is now maintained by the OpenZFS community.
-This repository contains the code for running OpenZFS on Linux and FreeBSD.
 
-[![codecov](https://codecov.io/gh/openzfs/zfs/branch/master/graph/badge.svg)](https://codecov.io/gh/openzfs/zfs)
-[![coverity](https://scan.coverity.com/projects/1973/badge.svg)](https://scan.coverity.com/projects/openzfs-zfs)
+[![codecov](https://codecov.io/gh/zfsonlinux/zfs/branch/master/graph/badge.svg)](https://codecov.io/gh/zfsonlinux/zfs)
+[![coverity](https://scan.coverity.com/projects/1973/badge.svg)](https://scan.coverity.com/projects/zfsonlinux-zfs)
 
 # Official Resources
 
-  * [Documentation](https://openzfs.github.io/openzfs-docs/) - for using and developing this repo
-  * [ZoL Site](https://zfsonlinux.org) - Linux release info & links
-  * [Mailing lists](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html)
-  * [OpenZFS site](https://openzfs.org/) - for conference videos and info on other platforms (illumos, OSX, Windows, etc)
+  * [Site](http://zfsonlinux.org)
+  * [Wiki](https://github.com/zfsonlinux/zfs/wiki)
+  * [Mailing lists](https://github.com/zfsonlinux/zfs/wiki/Mailing-Lists)
+  * [OpenZFS site](http://open-zfs.org/)
 
 # Installation
 
-Full documentation for installing OpenZFS on your favorite operating system can
-be found at the [Getting Started Page](https://openzfs.github.io/openzfs-docs/Getting%20Started/index.html).
+Full documentation for installing ZoL on your favorite Linux distribution can
+be found at [our site](http://zfsonlinux.org/).
 
 # Contribute & Develop
 
 We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md).
 
-We have a [Code of Conduct](./CODE_OF_CONDUCT.md).
-
 # Release
 
-OpenZFS is released under a CDDL license.
+ZFS on Linux is released under a CDDL license.  
 For more details see the NOTICE, LICENSE and COPYRIGHT files; `UCRL-CODE-235197`
 
 # Supported Kernels
-  * The `META` file contains the officially recognized supported Linux kernel versions.
-  * Supported FreeBSD versions are any supported branches and releases starting from 13.0-RELEASE.
+  * The `META` file contains the officially recognized supported kernel versions.

RELEASES.md

@@ -1,37 +0,0 @@
-OpenZFS uses the MAJOR.MINOR.PATCH versioning scheme described here:
-
-  * MAJOR - Incremented at the discretion of the OpenZFS developers to indicate
-    a particularly noteworthy feature or change. An increase in MAJOR number
-    does not indicate any incompatible on-disk format change. The ability
-    to import a ZFS pool is controlled by the feature flags enabled on the
-    pool and the feature flags supported by the installed OpenZFS version.
-    Increasing the MAJOR version is expected to be an infrequent occurrence.
-
-  * MINOR - Incremented to indicate new functionality such as a new feature
-    flag, pool/dataset property, zfs/zpool sub-command, new user/kernel
-    interface, etc. MINOR releases may introduce incompatible changes to the
-    user space library APIs (libzfs.so). Existing user/kernel interfaces are
-    considered to be stable to maximize compatibility between OpenZFS releases.
-    Additions to the user/kernel interface are backwards compatible.
-
-  * PATCH - Incremented when applying documentation updates, important bug
-    fixes, minor performance improvements, and kernel compatibility patches.
-    The user space library APIs and user/kernel interface are considered to
-    be stable. PATCH releases for a MAJOR.MINOR are published as needed.
-
-Two release branches are maintained for OpenZFS, they are:
-
-  * OpenZFS LTS - A designated MAJOR.MINOR release with periodic PATCH
-    releases that incorporate important changes backported from newer OpenZFS
-    releases. This branch is intended for use in environments using an
-    LTS, enterprise, or similarly managed kernel (RHEL, Ubuntu LTS, Debian).
-    Minor changes to support these distribution kernels will be applied as
-    needed. New kernel versions released after the OpenZFS LTS release are
-    not supported. LTS releases will receive patches for at least 2 years.
-    The current LTS release is OpenZFS 2.2.
-
-  * OpenZFS current - Tracks the newest MAJOR.MINOR release. This branch
-    includes support for the latest OpenZFS features and recently releases
-    kernels.  When a new MINOR release is tagged the previous MINOR release
-    will no longer be maintained (unless it is an LTS release). New MINOR
-    releases are planned to occur roughly annually.

TEST

@@ -48,3 +48,64 @@
 #TEST_ZFSSTRESS_VDEV="/var/tmp/vdev"
 #TEST_ZFSSTRESS_DIR="/$TEST_ZFSSTRESS_POOL/$TEST_ZFSSTRESS_FS"
 #TEST_ZFSSTRESS_OPTIONS=""
+
+### per-builder customization
+#
+# BB_NAME=builder-name <distribution-version-architecture-type>
+# - distribution=Amazon,Debian,Fedora,RHEL,SUSE,Ubuntu
+# - version=x.y
+# - architecture=x86_64,i686,arm,aarch64
+# - type=build,test
+#
+case "$BB_NAME" in
+Amazon*)
+    # ZFS enabled xfstests fails to build
+    TEST_XFSTESTS_SKIP="yes"
+    ;;
+CentOS-7*)
+    # ZFS enabled xfstests fails to build
+    TEST_XFSTESTS_SKIP="yes"
+    ;;
+CentOS-6*)
+    ;;
+Debian*)
+    ;;
+Fedora*)
+    ;;
+RHEL*)
+    ;;
+SUSE*)
+    ;;
+Ubuntu-16.04*)
+    # ZFS enabled xfstests fails to build
+    TEST_XFSTESTS_SKIP="yes"
+    ;;
+Ubuntu*)
+    ;;
+*)
+    ;;
+esac
+
+###
+#
+# Run ztest longer on the "coverage" builders to gain more code coverage
+# data out of ztest, libzpool, etc.
+#
+case "$BB_NAME" in
+*coverage*)
+    TEST_ZTEST_TIMEOUT=3600
+    ;;
+*)
+    TEST_ZTEST_TIMEOUT=900
+    ;;
+esac
+
+###
+#
+# Disable the following test suites on 32-bit systems.
+#
+if [ $(getconf LONG_BIT) = "32" ]; then
+    TEST_ZTEST_SKIP="yes"
+    TEST_XFSTESTS_SKIP="yes"
+    TEST_ZFSSTRESS_SKIP="yes"
+fi

autogen.sh

@@ -1,62 +1,4 @@
 #!/bin/sh
-[ "${0%/*}" = "$0" ] || cd "${0%/*}" || exit
 
-# %reldir%/%canon_reldir% (%D%/%C%) only appeared in automake 1.14, but RHEL/CentOS 7 has 1.13.4
-# This is an (overly) simplistic preprocessor that papers around this for the duration of the generation step,
-# and can be removed once support for CentOS 7 is dropped
-automake --version | awk '{print $NF; exit}' | (
-	IFS=. read -r AM_MAJ AM_MIN _
-	[ "$AM_MAJ" -gt 1 ] || [ "$AM_MIN" -ge 14 ]
-) || {
-	process_root() {
-		root="$1"; shift
-
-		grep -q '%[CD]%' "$root/Makefile.am" || return
-		find "$root" -name Makefile.am "$@" | while read -r dir; do
-			dir="${dir%/Makefile.am}"
-			grep -q '%[CD]%' "$dir/Makefile.am" || continue
-
-			reldir="${dir#"$root"}"
-			reldir="${reldir#/}"
-
-			canon_reldir="$(printf '%s' "$reldir" | tr -C 'a-zA-Z0-9@_' '_')"
-
-			reldir_slash="$reldir/"
-			canon_reldir_slash="${canon_reldir}_"
-			[ -z "$reldir" ] && reldir_slash=
-			[ -z "$reldir" ] && canon_reldir_slash=
-
-			echo "$dir/Makefile.am" >&3
-			sed -i~ -e "s:%D%/:$reldir_slash:g"       -e "s:%D%:$reldir:g" \
-			        -e "s:%C%_:$canon_reldir_slash:g" -e "s:%C%:$canon_reldir:g" "$dir/Makefile.am"
-		done 3>>"$substituted_files"
-	}
-
-	rollback() {
-		while read -r f; do
-			mv "$f~" "$f"
-		done < "$substituted_files"
-		rm -f "$substituted_files"
-	}
-
-
-	echo "Automake <1.14; papering over missing %reldir%/%canon_reldir% support" >&2
-
-	substituted_files="$(mktemp)"
-	trap rollback EXIT
-
-	roots="$(sed '/Makefile$/!d;/module/d;s:^\s*:./:;s:/Makefile::;/^\.$/d' configure.ac)"
-
-	IFS="
-"
-	for root in $roots; do
-		root="${root#./}"
-		process_root "$root"
-	done
-
-	set -f
-	# shellcheck disable=SC2086,SC2046
-	process_root . $(printf '!\n-path\n%s/*\n' $roots)
-}
-
-autoreconf -fiv && rm -rf autom4te.cache
+autoreconf -fiv || exit 1
+rm -Rf autom4te.cache

cmd/Makefile.am

@@ -1,114 +1,8 @@
-bin_SCRIPTS =
-bin_PROGRAMS =
-sbin_SCRIPTS =
-sbin_PROGRAMS =
-dist_bin_SCRIPTS =
-zfsexec_PROGRAMS =
-mounthelper_PROGRAMS =
-
-
-sbin_SCRIPTS      += fsck.zfs
-SHELLCHECKSCRIPTS += fsck.zfs
-CLEANFILES        += fsck.zfs
-dist_noinst_DATA  += %D%/fsck.zfs.in
-$(call SUBST,fsck.zfs,%D%/)
-
-
-sbin_PROGRAMS   += zfs_ids_to_path
-CPPCHECKTARGETS += zfs_ids_to_path
-
-zfs_ids_to_path_SOURCES = \
-	%D%/zfs_ids_to_path.c
-
-zfs_ids_to_path_LDADD = \
-	libzfs.la
-
-
-zhack_CPPFLAGS = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
-
-sbin_PROGRAMS   += zhack
-CPPCHECKTARGETS += zhack
-
-zhack_SOURCES = \
-	%D%/zhack.c
-
-zhack_LDADD = \
-	libzpool.la \
-	libzfs_core.la \
-	libnvpair.la
-
-
-ztest_CFLAGS    = $(AM_CFLAGS) $(KERNEL_CFLAGS)
-ztest_CPPFLAGS  = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
-
-sbin_PROGRAMS   += ztest
-CPPCHECKTARGETS += ztest
-
-ztest_SOURCES = \
-	%D%/ztest.c
-
-ztest_LDADD = \
-	libzpool.la \
-	libzfs_core.la \
-	libnvpair.la
-
-ztest_LDADD += -lm
-ztest_LDFLAGS = -pthread
-
-
-include $(srcdir)/%D%/raidz_test/Makefile.am
-include $(srcdir)/%D%/zdb/Makefile.am
-include $(srcdir)/%D%/zfs/Makefile.am
-include $(srcdir)/%D%/zinject/Makefile.am
-include $(srcdir)/%D%/zpool/Makefile.am
-include $(srcdir)/%D%/zpool_influxdb/Makefile.am
-include $(srcdir)/%D%/zstream/Makefile.am
-
-
-if BUILD_LINUX
-mounthelper_PROGRAMS += mount.zfs
-CPPCHECKTARGETS      += mount.zfs
-
-mount_zfs_SOURCES = \
-	%D%/mount_zfs.c
-
-mount_zfs_LDADD = \
-	libzfs.la \
-	libzfs_core.la \
-	libnvpair.la
-
-mount_zfs_LDADD += $(LTLIBINTL)
-
-CPPCHECKTARGETS += raidz_test
-
-
-sbin_PROGRAMS   += zgenhostid
-CPPCHECKTARGETS += zgenhostid
-
-zgenhostid_SOURCES = \
-	%D%/zgenhostid.c
-
-
-dist_bin_SCRIPTS  += %D%/zvol_wait
-SHELLCHECKSCRIPTS += %D%/zvol_wait
-
-
-include $(srcdir)/%D%/zed/Makefile.am
-endif
-
+SUBDIRS  = zfs zpool zdb zhack zinject zstreamdump ztest
+SUBDIRS += fsck_zfs vdev_id raidz_test zgenhostid
 
 if USING_PYTHON
-bin_SCRIPTS      += arc_summary     arcstat        dbufstat        zilstat
-CLEANFILES       += arc_summary     arcstat        dbufstat        zilstat
-dist_noinst_DATA += %D%/arc_summary %D%/arcstat.in %D%/dbufstat.in %D%/zilstat.in
-
-$(call SUBST,arcstat,%D%/)
-$(call SUBST,dbufstat,%D%/)
-$(call SUBST,zilstat,%D%/)
-arc_summary: %D%/arc_summary
-	$(AM_V_at)cp $< $@
+SUBDIRS += arcstat arc_summary dbufstat
 endif
 
-
-PHONY += cmd
-cmd: $(bin_SCRIPTS) $(bin_PROGRAMS) $(sbin_SCRIPTS) $(sbin_PROGRAMS) $(dist_bin_SCRIPTS) $(zfsexec_PROGRAMS) $(mounthelper_PROGRAMS)
+SUBDIRS += mount_zfs zed zvol_id

cmd/arc_summary/Makefile.am

@@ -0,0 +1,11 @@
+EXTRA_DIST = arc_summary2 arc_summary3
+
+if USING_PYTHON_2
+dist_bin_SCRIPTS = arc_summary2
+install-exec-hook:
+	mv $(DESTDIR)$(bindir)/arc_summary2 $(DESTDIR)$(bindir)/arc_summary
+else
+dist_bin_SCRIPTS = arc_summary3
+install-exec-hook:
+	mv $(DESTDIR)$(bindir)/arc_summary3 $(DESTDIR)$(bindir)/arc_summary
+endif

cmd/arc_summary/arc_summary3

@@ -0,0 +1,875 @@
+#!/usr/bin/python3
+#
+# Copyright (c) 2008 Ben Rockwood <benr@cuddletech.com>,
+# Copyright (c) 2010 Martin Matuska <mm@FreeBSD.org>,
+# Copyright (c) 2010-2011 Jason J. Hellenthal <jhell@DataIX.net>,
+# Copyright (c) 2017 Scot W. Stevenson <scot.stevenson@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+"""Print statistics on the ZFS ARC Cache and other information
+
+Provides basic information on the ARC, its efficiency, the L2ARC (if present),
+the Data Management Unit (DMU), Virtual Devices (VDEVs), and tunables. See
+the in-source documentation and code at
+https://github.com/zfsonlinux/zfs/blob/master/module/zfs/arc.c for details.
+The original introduction to arc_summary can be found at
+http://cuddletech.com/?p=454
+"""
+
+import argparse
+import os
+import subprocess
+import sys
+import time
+
+DECRIPTION = 'Print ARC and other statistics for ZFS on Linux'
+INDENT = ' '*8
+LINE_LENGTH = 72
+PROC_PATH = '/proc/spl/kstat/zfs/'
+SPL_PATH = '/sys/module/spl/parameters/'
+TUNABLES_PATH = '/sys/module/zfs/parameters/'
+DATE_FORMAT = '%a %b %d %H:%M:%S %Y'
+TITLE = 'ZFS Subsystem Report'
+
+SECTIONS = 'arc archits dmu l2arc spl tunables vdev zil'.split()
+SECTION_HELP = 'print info from one section ('+' '.join(SECTIONS)+')'
+
+# Tunables and SPL are handled separately because they come from
+# different sources
+SECTION_PATHS = {'arc': 'arcstats',
+                 'dmu': 'dmu_tx',
+                 'l2arc': 'arcstats',  # L2ARC stuff lives in arcstats
+                 'vdev': 'vdev_cache_stats',
+                 'xuio': 'xuio_stats',
+                 'zfetch': 'zfetchstats',
+                 'zil': 'zil'}
+
+parser = argparse.ArgumentParser(description=DECRIPTION)
+parser.add_argument('-a', '--alternate', action='store_true', default=False,
+                    help='use alternate formatting for tunables and SPL',
+                    dest='alt')
+parser.add_argument('-d', '--description', action='store_true', default=False,
+                    help='print descriptions with tunables and SPL',
+                    dest='desc')
+parser.add_argument('-g', '--graph', action='store_true', default=False,
+                    help='print graph on ARC use and exit', dest='graph')
+parser.add_argument('-p', '--page', type=int, dest='page',
+                    help='print page by number (DEPRECATED, use "-s")')
+parser.add_argument('-r', '--raw', action='store_true', default=False,
+                    help='dump all available data with minimal formatting',
+                    dest='raw')
+parser.add_argument('-s', '--section', dest='section', help=SECTION_HELP)
+ARGS = parser.parse_args()
+
+
+def cleanup_line(single_line):
+    """Format a raw line of data from /proc and isolate the name value
+    part, returning a tuple with each. Currently, this gets rid of the
+    middle '4'. For example "arc_no_grow    4    0" returns the tuple
+    ("arc_no_grow", "0").
+    """
+    name, _, value = single_line.split()
+
+    return name, value
+
+
+def draw_graph(kstats_dict):
+    """Draw a primitive graph representing the basic information on the
+    ARC -- its size and the proportion used by MFU and MRU -- and quit.
+    We use max size of the ARC to calculate how full it is. This is a
+    very rough representation.
+    """
+
+    arc_stats = isolate_section('arcstats', kstats_dict)
+
+    GRAPH_INDENT = ' '*4
+    GRAPH_WIDTH = 60
+    arc_size = f_bytes(arc_stats['size'])
+    arc_perc = f_perc(arc_stats['size'], arc_stats['c_max'])
+    mfu_size = f_bytes(arc_stats['mfu_size'])
+    mru_size = f_bytes(arc_stats['mru_size'])
+    meta_limit = f_bytes(arc_stats['arc_meta_limit'])
+    meta_size = f_bytes(arc_stats['arc_meta_used'])
+    dnode_limit = f_bytes(arc_stats['arc_dnode_limit'])
+    dnode_size = f_bytes(arc_stats['dnode_size'])
+
+    info_form = ('ARC: {0} ({1})  MFU: {2}  MRU: {3}  META: {4} ({5}) '
+                 'DNODE {6} ({7})')
+    info_line = info_form.format(arc_size, arc_perc, mfu_size, mru_size,
+                                 meta_size, meta_limit, dnode_size,
+                                 dnode_limit)
+    info_spc = ' '*int((GRAPH_WIDTH-len(info_line))/2)
+    info_line = GRAPH_INDENT+info_spc+info_line
+
+    graph_line = GRAPH_INDENT+'+'+('-'*(GRAPH_WIDTH-2))+'+'
+
+    mfu_perc = float(int(arc_stats['mfu_size'])/int(arc_stats['c_max']))
+    mru_perc = float(int(arc_stats['mru_size'])/int(arc_stats['c_max']))
+    arc_perc = float(int(arc_stats['size'])/int(arc_stats['c_max']))
+    total_ticks = float(arc_perc)*GRAPH_WIDTH
+    mfu_ticks = mfu_perc*GRAPH_WIDTH
+    mru_ticks = mru_perc*GRAPH_WIDTH
+    other_ticks = total_ticks-(mfu_ticks+mru_ticks)
+
+    core_form = 'F'*int(mfu_ticks)+'R'*int(mru_ticks)+'O'*int(other_ticks)
+    core_spc = ' '*(GRAPH_WIDTH-(2+len(core_form)))
+    core_line = GRAPH_INDENT+'|'+core_form+core_spc+'|'
+
+    for line in ('', info_line, graph_line, core_line, graph_line, ''):
+        print(line)
+
+
+def f_bytes(byte_string):
+    """Return human-readable representation of a byte value in
+    powers of 2 (eg "KiB" for "kibibytes", etc) to two decimal
+    points. Values smaller than one KiB are returned without
+    decimal points. Note "bytes" is a reserved keyword.
+    """
+
+    prefixes = ([2**80, "YiB"],   # yobibytes (yotta)
+                [2**70, "ZiB"],   # zebibytes (zetta)
+                [2**60, "EiB"],   # exbibytes (exa)
+                [2**50, "PiB"],   # pebibytes (peta)
+                [2**40, "TiB"],   # tebibytes (tera)
+                [2**30, "GiB"],   # gibibytes (giga)
+                [2**20, "MiB"],   # mebibytes (mega)
+                [2**10, "KiB"])   # kibibytes (kilo)
+
+    bites = int(byte_string)
+
+    if bites >= 2**10:
+        for limit, unit in prefixes:
+
+            if bites >= limit:
+                value = bites / limit
+                break
+
+        result = '{0:.1f} {1}'.format(value, unit)
+    else:
+        result = '{0} Bytes'.format(bites)
+
+    return result
+
+
+def f_hits(hits_string):
+    """Create a human-readable representation of the number of hits.
+    The single-letter symbols used are SI to avoid the confusion caused
+    by the different "short scale" and "long scale" representations in
+    English, which use the same words for different values. See
+    https://en.wikipedia.org/wiki/Names_of_large_numbers and:
+    https://physics.nist.gov/cuu/Units/prefixes.html
+    """
+
+    numbers = ([10**24, 'Y'],  # yotta (septillion)
+               [10**21, 'Z'],  # zetta (sextillion)
+               [10**18, 'E'],  # exa   (quintrillion)
+               [10**15, 'P'],  # peta  (quadrillion)
+               [10**12, 'T'],  # tera  (trillion)
+               [10**9, 'G'],   # giga  (billion)
+               [10**6, 'M'],   # mega  (million)
+               [10**3, 'k'])   # kilo  (thousand)
+
+    hits = int(hits_string)
+
+    if hits >= 1000:
+        for limit, symbol in numbers:
+
+            if hits >= limit:
+                value = hits/limit
+                break
+
+        result = "%0.1f%s" % (value, symbol)
+    else:
+        result = "%d" % hits
+
+    return result
+
+
+def f_perc(value1, value2):
+    """Calculate percentage and return in human-readable form. If
+    rounding produces the result '0.0' though the first number is
+    not zero, include a 'less-than' symbol to avoid confusion.
+    Division by zero is handled by returning 'n/a'; no error
+    is called.
+    """
+
+    v1 = float(value1)
+    v2 = float(value2)
+
+    try:
+        perc = 100 * v1/v2
+    except ZeroDivisionError:
+        result = 'n/a'
+    else:
+        result = '{0:0.1f} %'.format(perc)
+
+    if result == '0.0 %' and v1 > 0:
+        result = '< 0.1 %'
+
+    return result
+
+
+def format_raw_line(name, value):
+    """For the --raw option for the tunable and SPL outputs, decide on the
+    correct formatting based on the --alternate flag.
+    """
+
+    if ARGS.alt:
+        result = '{0}{1}={2}'.format(INDENT, name, value)
+    else:
+        spc = LINE_LENGTH-(len(INDENT)+len(value))
+        result = '{0}{1:<{spc}}{2}'.format(INDENT, name, value, spc=spc)
+
+    return result
+
+
+def get_kstats():
+    """Collect information on the ZFS subsystem from the /proc Linux virtual
+    file system. The step does not perform any further processing, giving us
+    the option to only work on what is actually needed. The name "kstat" is a
+    holdover from the Solaris utility of the same name.
+    """
+
+    result = {}
+    secs = SECTION_PATHS.values()
+
+    for section in secs:
+
+        with open(PROC_PATH+section, 'r') as proc_location:
+            lines = [line for line in proc_location]
+
+        del lines[0:2]  # Get rid of header
+        result[section] = lines
+
+    return result
+
+
+def get_spl_tunables(PATH):
+    """Collect information on the Solaris Porting Layer (SPL) or the
+    tunables, depending on the PATH given. Does not check if PATH is
+    legal.
+    """
+
+    result = {}
+    parameters = os.listdir(PATH)
+
+    for name in parameters:
+
+        with open(PATH+name, 'r') as para_file:
+            value = para_file.read()
+            result[name] = value.strip()
+
+    return result
+
+
+def get_descriptions(request):
+    """Get the decriptions of the Solaris Porting Layer (SPL) or the
+    tunables, return with minimal formatting.
+    """
+
+    if request not in ('spl', 'zfs'):
+        print('ERROR: description of "{0}" requested)'.format(request))
+        sys.exit(1)
+
+    descs = {}
+    target_prefix = 'parm:'
+
+    # We would prefer to do this with /sys/modules -- see the discussion at
+    # get_version() -- but there isn't a way to get the descriptions from
+    # there, so we fall back on modinfo
+    command = ["/sbin/modinfo", request, "-0"]
+
+    # The recommended way to do this is with subprocess.run(). However,
+    # some installed versions of Python are < 3.5, so we offer them
+    # the option of doing it the old way (for now)
+    info = ''
+
+    try:
+
+        if 'run' in dir(subprocess):
+            info = subprocess.run(command, stdout=subprocess.PIPE,
+                                  universal_newlines=True)
+            raw_output = info.stdout.split('\0')
+        else:
+            info = subprocess.check_output(command, universal_newlines=True)
+            raw_output = info.split('\0')
+
+    except subprocess.CalledProcessError:
+        print("Error: Descriptions not available (can't access kernel module)")
+        sys.exit(1)
+
+    for line in raw_output:
+
+        if not line.startswith(target_prefix):
+            continue
+
+        line = line[len(target_prefix):].strip()
+        name, raw_desc = line.split(':', 1)
+        desc = raw_desc.rsplit('(', 1)[0]
+
+        if desc == '':
+            desc = '(No description found)'
+
+        descs[name.strip()] = desc.strip()
+
+    return descs
+
+
+def get_version(request):
+    """Get the version number of ZFS or SPL on this machine for header.
+    Returns an error string, but does not raise an error, if we can't
+    get the ZFS/SPL version via modinfo.
+    """
+
+    if request not in ('spl', 'zfs'):
+        error_msg = '(ERROR: "{0}" requested)'.format(request)
+        return error_msg
+
+    # The original arc_summary called /sbin/modinfo/{spl,zfs} to get
+    # the version information. We switch to /sys/module/{spl,zfs}/version
+    # to make sure we get what is really loaded in the kernel
+    command = ["cat", "/sys/module/{0}/version".format(request)]
+    req = request.upper()
+    version = "(Can't get {0} version)".format(req)
+
+    # The recommended way to do this is with subprocess.run(). However,
+    # some installed versions of Python are < 3.5, so we offer them
+    # the option of doing it the old way (for now)
+    info = ''
+    if 'run' in dir(subprocess):
+        info = subprocess.run(command, stdout=subprocess.PIPE,
+                              universal_newlines=True)
+        version = info.stdout.strip()
+    else:
+        info = subprocess.check_output(command, universal_newlines=True)
+        version = info.strip()
+
+    return version
+
+
+def print_header():
+    """Print the initial heading with date and time as well as info on the
+    Linux and ZFS versions. This is not called for the graph.
+    """
+
+    # datetime is now recommended over time but we keep the exact formatting
+    # from the older version of arc_summary in case there are scripts
+    # that expect it in this way
+    daydate = time.strftime(DATE_FORMAT)
+    spc_date = LINE_LENGTH-len(daydate)
+    sys_version = os.uname()
+
+    sys_msg = sys_version.sysname+' '+sys_version.release
+    zfs = get_version('zfs')
+    spc_zfs = LINE_LENGTH-len(zfs)
+
+    machine_msg = 'Machine: '+sys_version.nodename+' ('+sys_version.machine+')'
+    spl = get_version('spl')
+    spc_spl = LINE_LENGTH-len(spl)
+
+    print('\n'+('-'*LINE_LENGTH))
+    print('{0:<{spc}}{1}'.format(TITLE, daydate, spc=spc_date))
+    print('{0:<{spc}}{1}'.format(sys_msg, zfs, spc=spc_zfs))
+    print('{0:<{spc}}{1}\n'.format(machine_msg, spl, spc=spc_spl))
+
+
+def print_raw(kstats_dict):
+    """Print all available data from the system in a minimally sorted format.
+    This can be used as a source to be piped through 'grep'.
+    """
+
+    sections = sorted(kstats_dict.keys())
+
+    for section in sections:
+
+        print('\n{0}:'.format(section.upper()))
+        lines = sorted(kstats_dict[section])
+
+        for line in lines:
+            name, value = cleanup_line(line)
+            print(format_raw_line(name, value))
+
+    # Tunables and SPL must be handled separately because they come from a
+    # different source and have descriptions the user might request
+    print()
+    section_spl()
+    section_tunables()
+
+
+def isolate_section(section_name, kstats_dict):
+    """From the complete information on all sections, retrieve only those
+    for one section.
+    """
+
+    try:
+        section_data = kstats_dict[section_name]
+    except KeyError:
+        print('ERROR: Data on {0} not available'.format(section_data))
+        sys.exit(1)
+
+    section_dict = dict(cleanup_line(l) for l in section_data)
+
+    return section_dict
+
+
+# Formatted output helper functions
+
+
+def prt_1(text, value):
+    """Print text and one value, no indent"""
+    spc = ' '*(LINE_LENGTH-(len(text)+len(value)))
+    print('{0}{spc}{1}'.format(text, value, spc=spc))
+
+
+def prt_i1(text, value):
+    """Print text and one value, with indent"""
+    spc = ' '*(LINE_LENGTH-(len(INDENT)+len(text)+len(value)))
+    print(INDENT+'{0}{spc}{1}'.format(text, value, spc=spc))
+
+
+def prt_2(text, value1, value2):
+    """Print text and two values, no indent"""
+    values = '{0:>9}  {1:>9}'.format(value1, value2)
+    spc = ' '*(LINE_LENGTH-(len(text)+len(values)+2))
+    print('{0}{spc}  {1}'.format(text, values, spc=spc))
+
+
+def prt_i2(text, value1, value2):
+    """Print text and two values, with indent"""
+    values = '{0:>9}  {1:>9}'.format(value1, value2)
+    spc = ' '*(LINE_LENGTH-(len(INDENT)+len(text)+len(values)+2))
+    print(INDENT+'{0}{spc}  {1}'.format(text, values, spc=spc))
+
+
+# The section output concentrates on important parameters instead of
+# being exhaustive (that is what the --raw parameter is for)
+
+
+def section_arc(kstats_dict):
+    """Give basic information on the ARC, MRU and MFU. This is the first
+    and most used section.
+    """
+
+    arc_stats = isolate_section('arcstats', kstats_dict)
+
+    throttle = arc_stats['memory_throttle_count']
+
+    if throttle == '0':
+        health = 'HEALTHY'
+    else:
+        health = 'THROTTLED'
+
+    prt_1('ARC status:', health)
+    prt_i1('Memory throttle count:', throttle)
+    print()
+
+    arc_size = arc_stats['size']
+    arc_target_size = arc_stats['c']
+    arc_max = arc_stats['c_max']
+    arc_min = arc_stats['c_min']
+    mfu_size = arc_stats['mfu_size']
+    mru_size = arc_stats['mru_size']
+    meta_limit = arc_stats['arc_meta_limit']
+    meta_size = arc_stats['arc_meta_used']
+    dnode_limit = arc_stats['arc_dnode_limit']
+    dnode_size = arc_stats['dnode_size']
+    target_size_ratio = '{0}:1'.format(int(arc_max) // int(arc_min))
+
+    prt_2('ARC size (current):',
+          f_perc(arc_size, arc_max), f_bytes(arc_size))
+    prt_i2('Target size (adaptive):',
+           f_perc(arc_target_size, arc_max), f_bytes(arc_target_size))
+    prt_i2('Min size (hard limit):',
+           f_perc(arc_min, arc_max), f_bytes(arc_min))
+    prt_i2('Max size (high water):',
+           target_size_ratio, f_bytes(arc_max))
+    caches_size = int(mfu_size)+int(mru_size)
+    prt_i2('Most Frequently Used (MFU) cache size:',
+           f_perc(mfu_size, caches_size), f_bytes(mfu_size))
+    prt_i2('Most Recently Used (MRU) cache size:',
+           f_perc(mru_size, caches_size), f_bytes(mru_size))
+    prt_i2('Metadata cache size (hard limit):',
+           f_perc(meta_limit, arc_max), f_bytes(meta_limit))
+    prt_i2('Metadata cache size (current):',
+           f_perc(meta_size, meta_limit), f_bytes(meta_size))
+    prt_i2('Dnode cache size (hard limit):',
+           f_perc(dnode_limit, meta_limit), f_bytes(dnode_limit))
+    prt_i2('Dnode cache size (current):',
+           f_perc(dnode_size, dnode_limit), f_bytes(dnode_size))
+    print()
+
+    print('ARC hash breakdown:')
+    prt_i1('Elements max:', f_hits(arc_stats['hash_elements_max']))
+    prt_i2('Elements current:',
+           f_perc(arc_stats['hash_elements'], arc_stats['hash_elements_max']),
+           f_hits(arc_stats['hash_elements']))
+    prt_i1('Collisions:', f_hits(arc_stats['hash_collisions']))
+
+    prt_i1('Chain max:', f_hits(arc_stats['hash_chain_max']))
+    prt_i1('Chains:', f_hits(arc_stats['hash_chains']))
+    print()
+
+    print('ARC misc:')
+    prt_i1('Deleted:', f_hits(arc_stats['deleted']))
+    prt_i1('Mutex misses:', f_hits(arc_stats['mutex_miss']))
+    prt_i1('Eviction skips:', f_hits(arc_stats['evict_skip']))
+    print()
+
+
+def section_archits(kstats_dict):
+    """Print information on how the caches are accessed ("arc hits").
+    """
+
+    arc_stats = isolate_section('arcstats', kstats_dict)
+    all_accesses = int(arc_stats['hits'])+int(arc_stats['misses'])
+    actual_hits = int(arc_stats['mfu_hits'])+int(arc_stats['mru_hits'])
+
+    prt_1('ARC total accesses (hits + misses):', f_hits(all_accesses))
+    ta_todo = (('Cache hit ratio:', arc_stats['hits']),
+               ('Cache miss ratio:', arc_stats['misses']),
+               ('Actual hit ratio (MFU + MRU hits):', actual_hits))
+
+    for title, value in ta_todo:
+        prt_i2(title, f_perc(value, all_accesses), f_hits(value))
+
+    dd_total = int(arc_stats['demand_data_hits']) +\
+        int(arc_stats['demand_data_misses'])
+    prt_i2('Data demand efficiency:',
+           f_perc(arc_stats['demand_data_hits'], dd_total),
+           f_hits(dd_total))
+
+    dp_total = int(arc_stats['prefetch_data_hits']) +\
+        int(arc_stats['prefetch_data_misses'])
+    prt_i2('Data prefetch efficiency:',
+           f_perc(arc_stats['prefetch_data_hits'], dp_total),
+           f_hits(dp_total))
+
+    known_hits = int(arc_stats['mfu_hits']) +\
+        int(arc_stats['mru_hits']) +\
+        int(arc_stats['mfu_ghost_hits']) +\
+        int(arc_stats['mru_ghost_hits'])
+
+    anon_hits = int(arc_stats['hits'])-known_hits
+
+    print()
+    print('Cache hits by cache type:')
+    cl_todo = (('Most frequently used (MFU):', arc_stats['mfu_hits']),
+               ('Most recently used (MRU):', arc_stats['mru_hits']),
+               ('Most frequently used (MFU) ghost:',
+                arc_stats['mfu_ghost_hits']),
+               ('Most recently used (MRU) ghost:',
+                arc_stats['mru_ghost_hits']))
+
+    for title, value in cl_todo:
+        prt_i2(title, f_perc(value, arc_stats['hits']), f_hits(value))
+
+    # For some reason, anon_hits can turn negative, which is weird. Until we
+    # have figured out why this happens, we just hide the problem, following
+    # the behavior of the original arc_summary.
+    if anon_hits >= 0:
+        prt_i2('Anonymously used:',
+               f_perc(anon_hits, arc_stats['hits']), f_hits(anon_hits))
+
+    print()
+    print('Cache hits by data type:')
+    dt_todo = (('Demand data:', arc_stats['demand_data_hits']),
+               ('Demand prefetch data:', arc_stats['prefetch_data_hits']),
+               ('Demand metadata:', arc_stats['demand_metadata_hits']),
+               ('Demand prefetch metadata:',
+                arc_stats['prefetch_metadata_hits']))
+
+    for title, value in dt_todo:
+        prt_i2(title, f_perc(value, arc_stats['hits']), f_hits(value))
+
+    print()
+    print('Cache misses by data type:')
+    dm_todo = (('Demand data:', arc_stats['demand_data_misses']),
+               ('Demand prefetch data:',
+                arc_stats['prefetch_data_misses']),
+               ('Demand metadata:', arc_stats['demand_metadata_misses']),
+               ('Demand prefetch metadata:',
+                arc_stats['prefetch_metadata_misses']))
+
+    for title, value in dm_todo:
+        prt_i2(title, f_perc(value, arc_stats['misses']), f_hits(value))
+
+    print()
+
+
+def section_dmu(kstats_dict):
+    """Collect information on the DMU"""
+
+    zfetch_stats = isolate_section('zfetchstats', kstats_dict)
+
+    zfetch_access_total = int(zfetch_stats['hits'])+int(zfetch_stats['misses'])
+
+    prt_1('DMU prefetch efficiency:', f_hits(zfetch_access_total))
+    prt_i2('Hit ratio:', f_perc(zfetch_stats['hits'], zfetch_access_total),
+           f_hits(zfetch_stats['hits']))
+    prt_i2('Miss ratio:', f_perc(zfetch_stats['misses'], zfetch_access_total),
+           f_hits(zfetch_stats['misses']))
+    print()
+
+
+def section_l2arc(kstats_dict):
+    """Collect information on L2ARC device if present. If not, tell user
+    that we're skipping the section.
+    """
+
+    # The L2ARC statistics live in the same section as the normal ARC stuff
+    arc_stats = isolate_section('arcstats', kstats_dict)
+
+    if arc_stats['l2_size'] == '0':
+        print('L2ARC not detected, skipping section\n')
+        return
+
+    l2_errors = int(arc_stats['l2_writes_error']) +\
+        int(arc_stats['l2_cksum_bad']) +\
+        int(arc_stats['l2_io_error'])
+
+    l2_access_total = int(arc_stats['l2_hits'])+int(arc_stats['l2_misses'])
+    health = 'HEALTHY'
+
+    if l2_errors > 0:
+        health = 'DEGRADED'
+
+    prt_1('L2ARC status:', health)
+
+    l2_todo = (('Low memory aborts:', 'l2_abort_lowmem'),
+               ('Free on write:', 'l2_free_on_write'),
+               ('R/W clashes:', 'l2_rw_clash'),
+               ('Bad checksums:', 'l2_cksum_bad'),
+               ('I/O errors:', 'l2_io_error'))
+
+    for title, value in l2_todo:
+        prt_i1(title, f_hits(arc_stats[value]))
+
+    print()
+    prt_1('L2ARC size (adaptive):', f_bytes(arc_stats['l2_size']))
+    prt_i2('Compressed:', f_perc(arc_stats['l2_asize'], arc_stats['l2_size']),
+           f_bytes(arc_stats['l2_asize']))
+    prt_i2('Header size:',
+           f_perc(arc_stats['l2_hdr_size'], arc_stats['l2_size']),
+           f_bytes(arc_stats['l2_hdr_size']))
+
+    print()
+    prt_1('L2ARC breakdown:', f_hits(l2_access_total))
+    prt_i2('Hit ratio:',
+           f_perc(arc_stats['l2_hits'], l2_access_total),
+           f_bytes(arc_stats['l2_hits']))
+    prt_i2('Miss ratio:',
+           f_perc(arc_stats['l2_misses'], l2_access_total),
+           f_bytes(arc_stats['l2_misses']))
+    prt_i1('Feeds:', f_hits(arc_stats['l2_feeds']))
+
+    print()
+    print('L2ARC writes:')
+
+    if arc_stats['l2_writes_done'] != arc_stats['l2_writes_sent']:
+        prt_i2('Writes sent:', 'FAULTED', f_hits(arc_stats['l2_writes_sent']))
+        prt_i2('Done ratio:',
+               f_perc(arc_stats['l2_writes_done'],
+                      arc_stats['l2_writes_sent']),
+               f_bytes(arc_stats['l2_writes_done']))
+        prt_i2('Error ratio:',
+               f_perc(arc_stats['l2_writes_error'],
+                      arc_stats['l2_writes_sent']),
+               f_bytes(arc_stats['l2_writes_error']))
+    else:
+        prt_i2('Writes sent:', '100 %', f_bytes(arc_stats['l2_writes_sent']))
+
+    print()
+    print('L2ARC evicts:')
+    prt_i1('Lock retries:', f_hits(arc_stats['l2_evict_lock_retry']))
+    prt_i1('Upon reading:', f_hits(arc_stats['l2_evict_reading']))
+    print()
+
+
+def section_spl(*_):
+    """Print the SPL parameters, if requested with alternative format
+    and/or decriptions. This does not use kstats.
+    """
+
+    spls = get_spl_tunables(SPL_PATH)
+    keylist = sorted(spls.keys())
+    print('Solaris Porting Layer (SPL):')
+
+    if ARGS.desc:
+        descriptions = get_descriptions('spl')
+
+    for key in keylist:
+        value = spls[key]
+
+        if ARGS.desc:
+            try:
+                print(INDENT+'#', descriptions[key])
+            except KeyError:
+                print(INDENT+'# (No decription found)')  # paranoid
+
+        print(format_raw_line(key, value))
+
+    print()
+
+
+def section_tunables(*_):
+    """Print the tunables, if requested with alternative format and/or
+    decriptions. This does not use kstasts.
+    """
+
+    tunables = get_spl_tunables(TUNABLES_PATH)
+    keylist = sorted(tunables.keys())
+    print('Tunables:')
+
+    if ARGS.desc:
+        descriptions = get_descriptions('zfs')
+
+    for key in keylist:
+        value = tunables[key]
+
+        if ARGS.desc:
+            try:
+                print(INDENT+'#', descriptions[key])
+            except KeyError:
+                print(INDENT+'# (No decription found)')  # paranoid
+
+        print(format_raw_line(key, value))
+
+    print()
+
+
+def section_vdev(kstats_dict):
+    """Collect information on VDEV caches"""
+
+    # Currently [Nov 2017] the VDEV cache is disabled, because it is actually
+    # harmful. When this is the case, we just skip the whole entry. See
+    # https://github.com/zfsonlinux/zfs/blob/master/module/zfs/vdev_cache.c
+    # for details
+    tunables = get_spl_tunables(TUNABLES_PATH)
+
+    if tunables['zfs_vdev_cache_size'] == '0':
+        print('VDEV cache disabled, skipping section\n')
+        return
+
+    vdev_stats = isolate_section('vdev_cache_stats', kstats_dict)
+
+    vdev_cache_total = int(vdev_stats['hits']) +\
+        int(vdev_stats['misses']) +\
+        int(vdev_stats['delegations'])
+
+    prt_1('VDEV cache summary:', f_hits(vdev_cache_total))
+    prt_i2('Hit ratio:', f_perc(vdev_stats['hits'], vdev_cache_total),
+           f_hits(vdev_stats['hits']))
+    prt_i2('Miss ratio:', f_perc(vdev_stats['misses'], vdev_cache_total),
+           f_hits(vdev_stats['misses']))
+    prt_i2('Delegations:', f_perc(vdev_stats['delegations'], vdev_cache_total),
+           f_hits(vdev_stats['delegations']))
+    print()
+
+
+def section_zil(kstats_dict):
+    """Collect information on the ZFS Intent Log. Some of the information
+    taken from https://github.com/zfsonlinux/zfs/blob/master/include/sys/zil.h
+    """
+
+    zil_stats = isolate_section('zil', kstats_dict)
+
+    prt_1('ZIL committed transactions:',
+          f_hits(zil_stats['zil_itx_count']))
+    prt_i1('Commit requests:', f_hits(zil_stats['zil_commit_count']))
+    prt_i1('Flushes to stable storage:',
+           f_hits(zil_stats['zil_commit_writer_count']))
+    prt_i2('Transactions to SLOG storage pool:',
+           f_bytes(zil_stats['zil_itx_metaslab_slog_bytes']),
+           f_hits(zil_stats['zil_itx_metaslab_slog_count']))
+    prt_i2('Transactions to non-SLOG storage pool:',
+           f_bytes(zil_stats['zil_itx_metaslab_normal_bytes']),
+           f_hits(zil_stats['zil_itx_metaslab_normal_count']))
+    print()
+
+
+section_calls = {'arc': section_arc,
+                 'archits': section_archits,
+                 'dmu': section_dmu,
+                 'l2arc': section_l2arc,
+                 'spl': section_spl,
+                 'tunables': section_tunables,
+                 'vdev': section_vdev,
+                 'zil': section_zil}
+
+
+def main():
+    """Run program. The options to draw a graph and to print all data raw are
+    treated separately because they come with their own call.
+    """
+
+    kstats = get_kstats()
+
+    if ARGS.graph:
+        draw_graph(kstats)
+        sys.exit(0)
+
+    print_header()
+
+    if ARGS.raw:
+        print_raw(kstats)
+
+    elif ARGS.section:
+
+        try:
+            section_calls[ARGS.section](kstats)
+        except KeyError:
+            print('Error: Section "{0}" unknown'.format(ARGS.section))
+            sys.exit(1)
+
+    elif ARGS.page:
+        print('WARNING: Pages are deprecated, please use "--section"\n')
+
+        pages_to_calls = {1: 'arc',
+                          2: 'archits',
+                          3: 'l2arc',
+                          4: 'dmu',
+                          5: 'vdev',
+                          6: 'tunables'}
+
+        try:
+            call = pages_to_calls[ARGS.page]
+        except KeyError:
+            print('Error: Page "{0}" not supported'.format(ARGS.page))
+            sys.exit(1)
+        else:
+            section_calls[call](kstats)
+
+    else:
+        # If no parameters were given, we print all sections. We might want to
+        # change the sequence by hand
+        calls = sorted(section_calls.keys())
+
+        for section in calls:
+            section_calls[section](kstats)
+
+    sys.exit(0)
+
+
+if __name__ == '__main__':
+    main()

cmd/arcstat.in

@@ -1,802 +0,0 @@
-#!/usr/bin/env @PYTHON_SHEBANG@
-# SPDX-License-Identifier: CDDL-1.0
-#
-# Print out ZFS ARC Statistics exported via kstat(1)
-# For a definition of fields, or usage, use arcstat -v
-#
-# This script was originally a fork of the original arcstat.pl (0.1)
-# by Neelakanth Nadgir, originally published on his Sun blog on
-# 09/18/2007
-#     http://blogs.sun.com/realneel/entry/zfs_arc_statistics
-#
-# A new version aimed to improve upon the original by adding features
-# and fixing bugs as needed.  This version was maintained by Mike
-# Harsch and was hosted in a public open source repository:
-#    http://github.com/mharsch/arcstat
-#
-# but has since moved to the illumos-gate repository.
-#
-# This Python port was written by John Hixson for FreeNAS, introduced
-# in commit e2c29f:
-#    https://github.com/freenas/freenas
-#
-# and has been improved by many people since.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  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 https://opensource.org/licenses/CDDL-1.0.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Fields have a fixed width. Every interval, we fill the "v"
-# hash with its corresponding value (v[field]=value) using calculate().
-# @hdr is the array of fields that needs to be printed, so we
-# just iterate over this array and print the values using our pretty printer.
-#
-# This script must remain compatible with Python 3.6+.
-#
-
-import sys
-import time
-import getopt
-import re
-import copy
-
-from signal import signal, SIGINT, SIGWINCH, SIG_DFL
-
-
-cols = {
-    # HDR:        [Size, Scale, Description]
-    "time":       [8, -1, "Time"],
-    "hits":       [4, 1000, "ARC hits per second"],
-    "iohs":       [4, 1000, "ARC I/O hits per second"],
-    "miss":       [4, 1000, "ARC misses per second"],
-    "read":       [4, 1000, "Total ARC accesses per second"],
-    "hit%":       [4, 100, "ARC hit percentage"],
-    "ioh%":       [4, 100, "ARC I/O hit percentage"],
-    "miss%":      [5, 100, "ARC miss percentage"],
-    "dhit":       [4, 1000, "Demand hits per second"],
-    "dioh":       [4, 1000, "Demand I/O hits per second"],
-    "dmis":       [4, 1000, "Demand misses per second"],
-    "dh%":        [3, 100, "Demand hit percentage"],
-    "di%":        [3, 100, "Demand I/O hit percentage"],
-    "dm%":        [3, 100, "Demand miss percentage"],
-    "ddhit":      [5, 1000, "Demand data hits per second"],
-    "ddioh":      [5, 1000, "Demand data I/O hits per second"],
-    "ddmis":      [5, 1000, "Demand data misses per second"],
-    "ddh%":       [4, 100, "Demand data hit percentage"],
-    "ddi%":       [4, 100, "Demand data I/O hit percentage"],
-    "ddm%":       [4, 100, "Demand data miss percentage"],
-    "dmhit":      [5, 1000, "Demand metadata hits per second"],
-    "dmioh":      [5, 1000, "Demand metadata I/O hits per second"],
-    "dmmis":      [5, 1000, "Demand metadata misses per second"],
-    "dmh%":       [4, 100, "Demand metadata hit percentage"],
-    "dmi%":       [4, 100, "Demand metadata I/O hit percentage"],
-    "dmm%":       [4, 100, "Demand metadata miss percentage"],
-    "phit":       [4, 1000, "Prefetch hits per second"],
-    "pioh":       [4, 1000, "Prefetch I/O hits per second"],
-    "pmis":       [4, 1000, "Prefetch misses per second"],
-    "ph%":        [3, 100, "Prefetch hits percentage"],
-    "pi%":        [3, 100, "Prefetch I/O hits percentage"],
-    "pm%":        [3, 100, "Prefetch miss percentage"],
-    "pdhit":      [5, 1000, "Prefetch data hits per second"],
-    "pdioh":      [5, 1000, "Prefetch data I/O hits per second"],
-    "pdmis":      [5, 1000, "Prefetch data misses per second"],
-    "pdh%":       [4, 100, "Prefetch data hits percentage"],
-    "pdi%":       [4, 100, "Prefetch data I/O hits percentage"],
-    "pdm%":       [4, 100, "Prefetch data miss percentage"],
-    "pmhit":      [5, 1000, "Prefetch metadata hits per second"],
-    "pmioh":      [5, 1000, "Prefetch metadata I/O hits per second"],
-    "pmmis":      [5, 1000, "Prefetch metadata misses per second"],
-    "pmh%":       [4, 100, "Prefetch metadata hits percentage"],
-    "pmi%":       [4, 100, "Prefetch metadata I/O hits percentage"],
-    "pmm%":       [4, 100, "Prefetch metadata miss percentage"],
-    "mhit":       [4, 1000, "Metadata hits per second"],
-    "mioh":       [4, 1000, "Metadata I/O hits per second"],
-    "mmis":       [4, 1000, "Metadata misses per second"],
-    "mread":      [5, 1000, "Metadata accesses per second"],
-    "mh%":        [3, 100, "Metadata hit percentage"],
-    "mi%":        [3, 100, "Metadata I/O hit percentage"],
-    "mm%":        [3, 100, "Metadata miss percentage"],
-    "arcsz":      [5, 1024, "ARC size"],
-    "size":       [5, 1024, "ARC size"],
-    "c":          [5, 1024, "ARC target size"],
-    "mfu":        [4, 1000, "MFU list hits per second"],
-    "mru":        [4, 1000, "MRU list hits per second"],
-    "mfug":       [4, 1000, "MFU ghost list hits per second"],
-    "mrug":       [4, 1000, "MRU ghost list hits per second"],
-    "unc":        [4, 1000, "Uncached list hits per second"],
-    "eskip":      [5, 1000, "evict_skip per second"],
-    "el2skip":    [7, 1000, "evict skip, due to l2 writes, per second"],
-    "el2cach":    [7, 1024, "Size of L2 cached evictions per second"],
-    "el2el":      [5, 1024, "Size of L2 eligible evictions per second"],
-    "el2mfu":     [6, 1024, "Size of L2 eligible MFU evictions per second"],
-    "el2mru":     [6, 1024, "Size of L2 eligible MRU evictions per second"],
-    "el2inel":    [7, 1024, "Size of L2 ineligible evictions per second"],
-    "mtxmis":     [6, 1000, "mutex_miss per second"],
-    "dread":      [5, 1000, "Demand accesses per second"],
-    "ddread":     [6, 1000, "Demand data accesses per second"],
-    "dmread":     [6, 1000, "Demand metadata accesses per second"],
-    "pread":      [5, 1000, "Prefetch accesses per second"],
-    "pdread":     [6, 1000, "Prefetch data accesses per second"],
-    "pmread":     [6, 1000, "Prefetch metadata accesses per second"],
-    "l2hits":     [6, 1000, "L2ARC hits per second"],
-    "l2miss":     [6, 1000, "L2ARC misses per second"],
-    "l2read":     [6, 1000, "Total L2ARC accesses per second"],
-    "l2hit%":     [6, 100, "L2ARC access hit percentage"],
-    "l2miss%":    [7, 100, "L2ARC access miss percentage"],
-    "l2pref":     [6, 1024, "L2ARC prefetch allocated size"],
-    "l2mfu":      [5, 1024, "L2ARC MFU allocated size"],
-    "l2mru":      [5, 1024, "L2ARC MRU allocated size"],
-    "l2data":     [6, 1024, "L2ARC data allocated size"],
-    "l2meta":     [6, 1024, "L2ARC metadata allocated size"],
-    "l2pref%":    [7, 100, "L2ARC prefetch percentage"],
-    "l2mfu%":     [6, 100, "L2ARC MFU percentage"],
-    "l2mru%":     [6, 100, "L2ARC MRU percentage"],
-    "l2data%":    [7, 100, "L2ARC data percentage"],
-    "l2meta%":    [7, 100, "L2ARC metadata percentage"],
-    "l2asize":    [7, 1024, "Actual (compressed) size of the L2ARC"],
-    "l2size":     [6, 1024, "Size of the L2ARC"],
-    "l2bytes":    [7, 1024, "Bytes read per second from the L2ARC"],
-    "l2wbytes":   [8, 1024, "Bytes written per second to the L2ARC"],
-    "grow":       [4, 1000, "ARC grow disabled"],
-    "need":       [5, 1024, "ARC reclaim need"],
-    "free":       [5, 1024, "ARC free memory"],
-    "avail":      [5, 1024, "ARC available memory"],
-    "waste":      [5, 1024, "Wasted memory due to round up to pagesize"],
-    "ztotal":     [6, 1000, "zfetch total prefetcher calls per second"],
-    "zhits":      [5, 1000, "zfetch stream hits per second"],
-    "zahead":     [6, 1000, "zfetch hits ahead of streams per second"],
-    "zpast":      [5, 1000, "zfetch hits behind streams per second"],
-    "zmisses":    [7, 1000, "zfetch stream misses per second"],
-    "zmax":       [4, 1000, "zfetch limit reached per second"],
-    "zfuture":    [7, 1000, "zfetch stream future per second"],
-    "zstride":    [7, 1000, "zfetch stream strides per second"],
-    "zissued":    [7, 1000, "zfetch prefetches issued per second"],
-    "zactive":    [7, 1000, "zfetch prefetches active per second"],
-}
-
-# ARC structural breakdown from arc_summary
-structfields = {
-    "cmp":      ["compressed", "Compressed"],
-    "ovh":      ["overhead", "Overhead"],
-    "bon":      ["bonus", "Bonus"],
-    "dno":      ["dnode", "Dnode"],
-    "dbu":      ["dbuf", "Dbuf"],
-    "hdr":      ["hdr", "Header"],
-    "l2h":      ["l2_hdr", "L2 header"],
-    "abd":      ["abd_chunk_waste", "ABD chunk waste"],
-}
-structstats = {                             # size stats
-    "percent":  "size",                     # percentage of this value
-    "sz":       ["_size", "size"],
-}
-
-# ARC types breakdown from arc_summary
-typefields = {
-    "data":     ["data", "ARC data"],
-    "meta":     ["metadata", "ARC metadata"],
-}
-typestats = {                               # size stats
-    "percent":  "cachessz",                 # percentage of this value
-    "tg":       ["_target", "target"],
-    "sz":       ["_size", "size"],
-}
-
-# ARC states breakdown from arc_summary
-statefields = {
-    "ano":      ["anon", "Anonymous"],
-    "mfu":      ["mfu", "MFU"],
-    "mru":      ["mru", "MRU"],
-    "unc":      ["uncached", "Uncached"],
-}
-targetstats = {
-    "percent":  "cachessz",                 # percentage of this value
-    "fields":   ["mfu", "mru"],             # only applicable to these fields
-    "tg":       ["_target", "target"],
-    "dt":       ["_data_target", "data target"],
-    "mt":       ["_metadata_target", "metadata target"],
-}
-statestats = {                              # size stats
-    "percent":  "cachessz",                 # percentage of this value
-    "sz":       ["_size", "size"],
-    "da":       ["_data", "data size"],
-    "me":       ["_metadata", "metadata size"],
-    "ed":       ["_evictable_data", "evictable data size"],
-    "em":       ["_evictable_metadata", "evictable metadata size"],
-}
-ghoststats = {
-    "fields":   ["mfu", "mru"],             # only applicable to these fields
-    "gsz":      ["_ghost_size", "ghost size"],
-    "gd":       ["_ghost_data", "ghost data size"],
-    "gm":       ["_ghost_metadata", "ghost metadata size"],
-}
-
-# fields and stats
-fieldstats = [
-    [structfields, structstats],
-    [typefields, typestats],
-    [statefields, targetstats, statestats, ghoststats],
-]
-for fs in fieldstats:
-    fields, stats = fs[0], fs[1:]
-    for field, fieldval in fields.items():
-        for group in stats:
-            for stat, statval in group.items():
-                if stat in ["fields", "percent"] or \
-                    ("fields" in group and field not in group["fields"]):
-                    continue
-                colname = field + stat
-                coldesc = fieldval[1] + " " + statval[1]
-                cols[colname] = [len(colname), 1024, coldesc]
-                if "percent" in group:
-                    cols[colname + "%"] = [len(colname) + 1, 100, \
-                        coldesc + " percentage"]
-
-v = {}
-hdr = ["time", "read", "ddread", "ddh%", "dmread", "dmh%", "pread", "ph%",
-       "size", "c", "avail"]
-xhdr = ["time", "mfu", "mru", "mfug", "mrug", "unc", "eskip", "mtxmis",
-        "dread", "pread", "read"]
-zhdr = ["time", "ztotal", "zhits", "zahead", "zpast", "zmisses", "zmax",
-        "zfuture", "zstride", "zissued", "zactive"]
-sint = 1               # Default interval is 1 second
-count = 1              # Default count is 1
-hdr_intr = 20          # Print header every 20 lines of output
-opfile = None
-sep = "  "              # Default separator is 2 spaces
-l2exist = False
-cmd = ("Usage: arcstat [-havxp] [-f fields] [-o file] [-s string] [interval "
-       "[count]]\n")
-cur = {}
-d = {}
-out = None
-kstat = None
-pretty_print = True
-
-
-if sys.platform.startswith('freebsd'):
-    # Requires py-sysctl on FreeBSD
-    import sysctl
-
-    def kstat_update():
-        global kstat
-
-        k = [ctl for ctl in sysctl.filter('kstat.zfs.misc.arcstats')
-             if ctl.type != sysctl.CTLTYPE_NODE]
-        k += [ctl for ctl in sysctl.filter('kstat.zfs.misc.zfetchstats')
-             if ctl.type != sysctl.CTLTYPE_NODE]
-
-        if not k:
-            sys.exit(1)
-
-        kstat = {}
-
-        for s in k:
-            if not s:
-                continue
-
-            name, value = s.name, s.value
-
-            if "arcstats" in name:
-                # Trims 'kstat.zfs.misc.arcstats' from the name
-                kstat[name[24:]] = int(value)
-            else:
-                kstat["zfetch_" + name[27:]] = int(value)
-
-elif sys.platform.startswith('linux'):
-    def kstat_update():
-        global kstat
-
-        k1 = [line.strip() for line in open('/proc/spl/kstat/zfs/arcstats')]
-
-        k2 = ["zfetch_" + line.strip() for line in
-             open('/proc/spl/kstat/zfs/zfetchstats')]
-
-        if k1 is None or k2 is None:
-            sys.exit(1)
-
-        del k1[0:2]
-        del k2[0:2]
-        k = k1 + k2
-        kstat = {}
-
-        for s in k:
-            if not s:
-                continue
-
-            name, unused, value = s.split()
-            kstat[name] = int(value)
-
-
-def detailed_usage():
-    sys.stderr.write("%s\n" % cmd)
-    sys.stderr.write("Field definitions are as follows:\n")
-    for key in cols:
-        sys.stderr.write("%11s : %s\n" % (key, cols[key][2]))
-    sys.stderr.write("\n")
-
-    sys.exit(0)
-
-
-def usage():
-    sys.stderr.write("%s\n" % cmd)
-    sys.stderr.write("\t -h : Print this help message\n")
-    sys.stderr.write("\t -a : Print all possible stats\n")
-    sys.stderr.write("\t -v : List all possible field headers and definitions"
-                     "\n")
-    sys.stderr.write("\t -x : Print extended stats\n")
-    sys.stderr.write("\t -z : Print zfetch stats\n")
-    sys.stderr.write("\t -f : Specify specific fields to print (see -v)\n")
-    sys.stderr.write("\t -o : Redirect output to the specified file\n")
-    sys.stderr.write("\t -s : Override default field separator with custom "
-                     "character or string\n")
-    sys.stderr.write("\t -p : Disable auto-scaling of numerical fields\n")
-    sys.stderr.write("\nExamples:\n")
-    sys.stderr.write("\tarcstat -o /tmp/a.log 2 10\n")
-    sys.stderr.write("\tarcstat -s \",\" -o /tmp/a.log 2 10\n")
-    sys.stderr.write("\tarcstat -v\n")
-    sys.stderr.write("\tarcstat -f time,hit%,dh%,ph%,mh% 1\n")
-    sys.stderr.write("\n")
-
-    sys.exit(1)
-
-
-def snap_stats():
-    global cur
-    global kstat
-
-    prev = copy.deepcopy(cur)
-    kstat_update()
-
-    cur = kstat
-
-    # fill in additional values from arc_summary
-    cur["caches_size"] = caches_size = cur["anon_data"]+cur["anon_metadata"]+\
-        cur["mfu_data"]+cur["mfu_metadata"]+cur["mru_data"]+cur["mru_metadata"]+\
-        cur["uncached_data"]+cur["uncached_metadata"]
-    s = 4294967296
-    pd = cur["pd"]
-    pm = cur["pm"]
-    meta = cur["meta"]
-    v = (s-int(pd))*(s-int(meta))/s
-    cur["mfu_data_target"] = v / 65536 * caches_size / 65536
-    v = (s-int(pm))*int(meta)/s
-    cur["mfu_metadata_target"] = v / 65536 * caches_size / 65536
-    v = int(pd)*(s-int(meta))/s
-    cur["mru_data_target"] = v / 65536 * caches_size / 65536
-    v = int(pm)*int(meta)/s
-    cur["mru_metadata_target"] = v / 65536 * caches_size / 65536
-
-    cur["data_target"] = cur["mfu_data_target"] + cur["mru_data_target"]
-    cur["metadata_target"] = cur["mfu_metadata_target"] + cur["mru_metadata_target"]
-    cur["mfu_target"] = cur["mfu_data_target"] + cur["mfu_metadata_target"]
-    cur["mru_target"] = cur["mru_data_target"] + cur["mru_metadata_target"]
-
-    for key in cur:
-        if re.match(key, "class"):
-            continue
-        if key in prev:
-            d[key] = cur[key] - prev[key]
-        else:
-            d[key] = cur[key]
-
-
-def isint(num):
-    if isinstance(num, float):
-        return num.is_integer()
-    if isinstance(num, int):
-        return True
-    return False
-
-
-def prettynum(sz, scale, num=0):
-    suffix = ['', 'K', 'M', 'G', 'T', 'P', 'E', 'Z']
-    index = 0
-
-    # Special case for date field
-    if scale == -1:
-        return "%s" % num
-
-    if scale != 100:
-        while abs(num) > scale and index < 5:
-            num = num / scale
-            index += 1
-
-    width = sz - (0 if index == 0 else 1)
-    intlen = len("%.0f" % num)              # %.0f rounds to nearest int
-    if sint == 1 and isint(num) or width < intlen + 2:
-        decimal = 0
-    else:
-        decimal = 1
-    return "%*.*f%s" % (width, decimal, num, suffix[index])
-
-
-def print_values():
-    global hdr
-    global sep
-    global v
-    global pretty_print
-
-    if pretty_print:
-        fmt = lambda col: prettynum(cols[col][0], cols[col][1], v[col])
-    else:
-        fmt = lambda col: str(v[col])
-
-    sys.stdout.write(sep.join(fmt(col) for col in hdr))
-    sys.stdout.write("\n")
-    sys.stdout.flush()
-
-
-def print_header():
-    global hdr
-    global sep
-    global pretty_print
-
-    if pretty_print:
-        fmt = lambda col: "%*s" % (cols[col][0], col)
-    else:
-        fmt = lambda col: col
-
-    sys.stdout.write(sep.join(fmt(col) for col in hdr))
-    sys.stdout.write("\n")
-
-
-def get_terminal_lines():
-    try:
-        import fcntl
-        import termios
-        import struct
-        data = fcntl.ioctl(sys.stdout.fileno(), termios.TIOCGWINSZ, '1234')
-        sz = struct.unpack('hh', data)
-        return sz[0]
-    except Exception:
-        pass
-
-
-def update_hdr_intr():
-    global hdr_intr
-
-    lines = get_terminal_lines()
-    if lines and lines > 3:
-        hdr_intr = lines - 3
-
-
-def resize_handler(signum, frame):
-    update_hdr_intr()
-
-
-def init():
-    global sint
-    global count
-    global hdr
-    global xhdr
-    global zhdr
-    global opfile
-    global sep
-    global out
-    global l2exist
-    global pretty_print
-
-    desired_cols = None
-    aflag = False
-    xflag = False
-    hflag = False
-    vflag = False
-    zflag = False
-    i = 1
-
-    try:
-        opts, args = getopt.getopt(
-            sys.argv[1:],
-            "axzo:hvs:f:p",
-            [
-                "all",
-                "extended",
-                "zfetch",
-                "outfile",
-                "help",
-                "verbose",
-                "separator",
-                "columns",
-                "parsable"
-            ]
-        )
-    except getopt.error as msg:
-        sys.stderr.write("Error: %s\n" % str(msg))
-        usage()
-        opts = None
-
-    for opt, arg in opts:
-        if opt in ('-a', '--all'):
-            aflag = True
-        if opt in ('-x', '--extended'):
-            xflag = True
-        if opt in ('-o', '--outfile'):
-            opfile = arg
-            i += 1
-        if opt in ('-h', '--help'):
-            hflag = True
-        if opt in ('-v', '--verbose'):
-            vflag = True
-        if opt in ('-s', '--separator'):
-            sep = arg
-            i += 1
-        if opt in ('-f', '--columns'):
-            desired_cols = arg
-            i += 1
-        if opt in ('-p', '--parsable'):
-            pretty_print = False
-        if opt in ('-z', '--zfetch'):
-            zflag = True
-        i += 1
-
-    argv = sys.argv[i:]
-    sint = int(argv[0]) if argv else sint
-    count = int(argv[1]) if len(argv) > 1 else (0 if len(argv) > 0 else 1)
-
-    if hflag or (xflag and zflag) or ((zflag or xflag) and desired_cols):
-        usage()
-
-    if vflag:
-        detailed_usage()
-
-    if xflag:
-        hdr = xhdr
-
-    if zflag:
-        hdr = zhdr
-
-    update_hdr_intr()
-
-    # check if L2ARC exists
-    snap_stats()
-    l2_size = cur.get("l2_size")
-    if l2_size:
-        l2exist = True
-
-    if desired_cols:
-        hdr = desired_cols.split(",")
-
-        invalid = []
-        incompat = []
-        for ele in hdr:
-            if ele not in cols:
-                invalid.append(ele)
-            elif not l2exist and ele.startswith("l2"):
-                sys.stdout.write("No L2ARC Here\n%s\n" % ele)
-                incompat.append(ele)
-
-        if len(invalid) > 0:
-            sys.stderr.write("Invalid column definition! -- %s\n" % invalid)
-            usage()
-
-        if len(incompat) > 0:
-            sys.stderr.write("Incompatible field specified! -- %s\n" %
-                             incompat)
-            usage()
-
-    if aflag:
-        if l2exist:
-            hdr = cols.keys()
-        else:
-            hdr = [col for col in cols.keys() if not col.startswith("l2")]
-
-    if opfile:
-        try:
-            out = open(opfile, "w")
-            sys.stdout = out
-
-        except IOError:
-            sys.stderr.write("Cannot open %s for writing\n" % opfile)
-            sys.exit(1)
-
-
-def calculate():
-    global d
-    global v
-    global l2exist
-
-    v = dict()
-    v["time"] = time.strftime("%H:%M:%S", time.localtime())
-    v["hits"] = d["hits"] / sint
-    v["iohs"] = d["iohits"] / sint
-    v["miss"] = d["misses"] / sint
-    v["read"] = v["hits"] + v["iohs"] + v["miss"]
-    v["hit%"] = 100 * v["hits"] / v["read"] if v["read"] > 0 else 0
-    v["ioh%"] = 100 * v["iohs"] / v["read"] if v["read"] > 0 else 0
-    v["miss%"] = 100 - v["hit%"] - v["ioh%"] if v["read"] > 0 else 0
-
-    v["dhit"] = (d["demand_data_hits"] + d["demand_metadata_hits"]) / sint
-    v["dioh"] = (d["demand_data_iohits"] + d["demand_metadata_iohits"]) / sint
-    v["dmis"] = (d["demand_data_misses"] + d["demand_metadata_misses"]) / sint
-
-    v["dread"] = v["dhit"] + v["dioh"] + v["dmis"]
-    v["dh%"] = 100 * v["dhit"] / v["dread"] if v["dread"] > 0 else 0
-    v["di%"] = 100 * v["dioh"] / v["dread"] if v["dread"] > 0 else 0
-    v["dm%"] = 100 - v["dh%"] - v["di%"] if v["dread"] > 0 else 0
-
-    v["ddhit"] = d["demand_data_hits"] / sint
-    v["ddioh"] = d["demand_data_iohits"] / sint
-    v["ddmis"] = d["demand_data_misses"] / sint
-
-    v["ddread"] = v["ddhit"] + v["ddioh"] + v["ddmis"]
-    v["ddh%"] = 100 * v["ddhit"] / v["ddread"] if v["ddread"] > 0 else 0
-    v["ddi%"] = 100 * v["ddioh"] / v["ddread"] if v["ddread"] > 0 else 0
-    v["ddm%"] = 100 - v["ddh%"] - v["ddi%"] if v["ddread"] > 0 else 0
-
-    v["dmhit"] = d["demand_metadata_hits"] / sint
-    v["dmioh"] = d["demand_metadata_iohits"] / sint
-    v["dmmis"] = d["demand_metadata_misses"] / sint
-
-    v["dmread"] = v["dmhit"] + v["dmioh"] + v["dmmis"]
-    v["dmh%"] = 100 * v["dmhit"] / v["dmread"] if v["dmread"] > 0 else 0
-    v["dmi%"] = 100 * v["dmioh"] / v["dmread"] if v["dmread"] > 0 else 0
-    v["dmm%"] = 100 - v["dmh%"] - v["dmi%"] if v["dmread"] > 0 else 0
-
-    v["phit"] = (d["prefetch_data_hits"] + d["prefetch_metadata_hits"]) / sint
-    v["pioh"] = (d["prefetch_data_iohits"] +
-                 d["prefetch_metadata_iohits"]) / sint
-    v["pmis"] = (d["prefetch_data_misses"] +
-                 d["prefetch_metadata_misses"]) / sint
-
-    v["pread"] = v["phit"] + v["pioh"] + v["pmis"]
-    v["ph%"] = 100 * v["phit"] / v["pread"] if v["pread"] > 0 else 0
-    v["pi%"] = 100 * v["pioh"] / v["pread"] if v["pread"] > 0 else 0
-    v["pm%"] = 100 - v["ph%"] - v["pi%"] if v["pread"] > 0 else 0
-
-    v["pdhit"] = d["prefetch_data_hits"] / sint
-    v["pdioh"] = d["prefetch_data_iohits"] / sint
-    v["pdmis"] = d["prefetch_data_misses"] / sint
-
-    v["pdread"] = v["pdhit"] + v["pdioh"] + v["pdmis"]
-    v["pdh%"] = 100 * v["pdhit"] / v["pdread"] if v["pdread"] > 0 else 0
-    v["pdi%"] = 100 * v["pdioh"] / v["pdread"] if v["pdread"] > 0 else 0
-    v["pdm%"] = 100 - v["pdh%"] - v["pdi%"] if v["pdread"] > 0 else 0
-
-    v["pmhit"] = d["prefetch_metadata_hits"] / sint
-    v["pmioh"] = d["prefetch_metadata_iohits"] / sint
-    v["pmmis"] = d["prefetch_metadata_misses"] / sint
-
-    v["pmread"] = v["pmhit"] + v["pmioh"] + v["pmmis"]
-    v["pmh%"] = 100 * v["pmhit"] / v["pmread"] if v["pmread"] > 0 else 0
-    v["pmi%"] = 100 * v["pmioh"] / v["pmread"] if v["pmread"] > 0 else 0
-    v["pmm%"] = 100 - v["pmh%"] - v["pmi%"] if v["pmread"] > 0 else 0
-
-    v["mhit"] = (d["prefetch_metadata_hits"] +
-                 d["demand_metadata_hits"]) / sint
-    v["mioh"] = (d["prefetch_metadata_iohits"] +
-                 d["demand_metadata_iohits"]) / sint
-    v["mmis"] = (d["prefetch_metadata_misses"] +
-                 d["demand_metadata_misses"]) / sint
-
-    v["mread"] = v["mhit"] + v["mioh"] + v["mmis"]
-    v["mh%"] = 100 * v["mhit"] / v["mread"] if v["mread"] > 0 else 0
-    v["mi%"] = 100 * v["mioh"] / v["mread"] if v["mread"] > 0 else 0
-    v["mm%"] = 100 - v["mh%"] - v["mi%"] if v["mread"] > 0 else 0
-
-    v["arcsz"] = cur["size"]
-    v["size"] = cur["size"]
-    v["c"] = cur["c"]
-    v["mfu"] = d["mfu_hits"] / sint
-    v["mru"] = d["mru_hits"] / sint
-    v["mrug"] = d["mru_ghost_hits"] / sint
-    v["mfug"] = d["mfu_ghost_hits"] / sint
-    v["unc"] = d["uncached_hits"] / sint
-    v["eskip"] = d["evict_skip"] / sint
-    v["el2skip"] = d["evict_l2_skip"] / sint
-    v["el2cach"] = d["evict_l2_cached"] / sint
-    v["el2el"] = d["evict_l2_eligible"] / sint
-    v["el2mfu"] = d["evict_l2_eligible_mfu"] / sint
-    v["el2mru"] = d["evict_l2_eligible_mru"] / sint
-    v["el2inel"] = d["evict_l2_ineligible"] / sint
-    v["mtxmis"] = d["mutex_miss"] / sint
-    v["ztotal"] = (d["zfetch_hits"] + d["zfetch_future"] + d["zfetch_stride"] +
-                   d["zfetch_past"] + d["zfetch_misses"]) / sint
-    v["zhits"] = d["zfetch_hits"] / sint
-    v["zahead"] = (d["zfetch_future"] + d["zfetch_stride"]) / sint
-    v["zpast"] = d["zfetch_past"] / sint
-    v["zmisses"] = d["zfetch_misses"] / sint
-    v["zmax"] = d["zfetch_max_streams"] / sint
-    v["zfuture"] = d["zfetch_future"] / sint
-    v["zstride"] = d["zfetch_stride"] / sint
-    v["zissued"] = d["zfetch_io_issued"] / sint
-    v["zactive"] = d["zfetch_io_active"] / sint
-
-    # ARC structural breakdown, ARC types breakdown, ARC states breakdown
-    v["cachessz"] = cur["caches_size"]
-    for fs in fieldstats:
-        fields, stats = fs[0], fs[1:]
-        for field, fieldval in fields.items():
-            for group in stats:
-                for stat, statval in group.items():
-                    if stat in ["fields", "percent"] or \
-                        ("fields" in group and field not in group["fields"]):
-                        continue
-                    colname = field + stat
-                    v[colname] = cur[fieldval[0] + statval[0]]
-                    if "percent" in group:
-                        v[colname + "%"] = 100 * v[colname] / \
-                            v[group["percent"]] if v[group["percent"]] > 0 else 0
-
-    if l2exist:
-        v["l2hits"] = d["l2_hits"] / sint
-        v["l2miss"] = d["l2_misses"] / sint
-        v["l2read"] = v["l2hits"] + v["l2miss"]
-        v["l2hit%"] = 100 * v["l2hits"] / v["l2read"] if v["l2read"] > 0 else 0
-
-        v["l2miss%"] = 100 - v["l2hit%"] if v["l2read"] > 0 else 0
-        v["l2asize"] = cur["l2_asize"]
-        v["l2size"] = cur["l2_size"]
-        v["l2bytes"] = d["l2_read_bytes"] / sint
-        v["l2wbytes"] = d["l2_write_bytes"] / sint
-
-        v["l2pref"] = cur["l2_prefetch_asize"]
-        v["l2mfu"] = cur["l2_mfu_asize"]
-        v["l2mru"] = cur["l2_mru_asize"]
-        v["l2data"] = cur["l2_bufc_data_asize"]
-        v["l2meta"] = cur["l2_bufc_metadata_asize"]
-        v["l2pref%"] = 100 * v["l2pref"] / v["l2asize"]
-        v["l2mfu%"] = 100 * v["l2mfu"] / v["l2asize"]
-        v["l2mru%"] = 100 * v["l2mru"] / v["l2asize"]
-        v["l2data%"] = 100 * v["l2data"] / v["l2asize"]
-        v["l2meta%"] = 100 * v["l2meta"] / v["l2asize"]
-
-    v["grow"] = 0 if cur["arc_no_grow"] else 1
-    v["need"] = cur["arc_need_free"]
-    v["free"] = cur["memory_free_bytes"]
-    v["avail"] = cur["memory_available_bytes"]
-    v["waste"] = cur["abd_chunk_waste_size"]
-
-
-def main():
-    global sint
-    global count
-    global hdr_intr
-
-    i = 0
-    count_flag = 0
-
-    init()
-    if count > 0:
-        count_flag = 1
-
-    signal(SIGINT, SIG_DFL)
-    signal(SIGWINCH, resize_handler)
-    while True:
-        if i == 0:
-            print_header()
-
-        snap_stats()
-        calculate()
-        print_values()
-
-        if count_flag == 1:
-            if count <= 1:
-                break
-            count -= 1
-
-        i = 0 if i >= hdr_intr else i + 1
-        time.sleep(sint)
-
-    if out:
-        out.close()
-
-
-if __name__ == '__main__':
-    main()

cmd/arcstat/Makefile.am

@@ -0,0 +1,13 @@
+dist_bin_SCRIPTS = arcstat
+
+#
+# The arcstat script is compatibile with both Python 2.6 and 3.4.
+# As such the python 3 shebang can be replaced at install time when
+# targeting a python 2 system.  This allows us to maintain a single
+# version of the source.
+#
+if USING_PYTHON_2
+install-exec-hook:
+	sed --in-place 's|^#!/usr/bin/python3|#!/usr/bin/python2|' \
+	    $(DESTDIR)$(bindir)/arcstat
+endif

cmd/arcstat/arcstat

@@ -0,0 +1,470 @@
+#!/usr/bin/python3
+#
+# Print out ZFS ARC Statistics exported via kstat(1)
+# For a definition of fields, or usage, use arctstat.pl -v
+#
+# This script is a fork of the original arcstat.pl (0.1) by
+# Neelakanth Nadgir, originally published on his Sun blog on
+# 09/18/2007
+#     http://blogs.sun.com/realneel/entry/zfs_arc_statistics
+#
+# This version aims to improve upon the original by adding features
+# and fixing bugs as needed.  This version is maintained by
+# Mike Harsch and is hosted in a public open source repository:
+#    http://github.com/mharsch/arcstat
+#
+# Comments, Questions, or Suggestions are always welcome.
+# Contact the maintainer at ( mike at harschsystems dot com )
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  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.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Fields have a fixed width. Every interval, we fill the "v"
+# hash with its corresponding value (v[field]=value) using calculate().
+# @hdr is the array of fields that needs to be printed, so we
+# just iterate over this array and print the values using our pretty printer.
+#
+# This script must remain compatible with Python 2.6+ and Python 3.4+.
+#
+
+import sys
+import time
+import getopt
+import re
+import copy
+
+from decimal import Decimal
+from signal import signal, SIGINT, SIGWINCH, SIG_DFL
+
+cols = {
+    # HDR:        [Size, Scale, Description]
+    "time":       [8, -1, "Time"],
+    "hits":       [4, 1000, "ARC reads per second"],
+    "miss":       [4, 1000, "ARC misses per second"],
+    "read":       [4, 1000, "Total ARC accesses per second"],
+    "hit%":       [4, 100, "ARC Hit percentage"],
+    "miss%":      [5, 100, "ARC miss percentage"],
+    "dhit":       [4, 1000, "Demand hits per second"],
+    "dmis":       [4, 1000, "Demand misses per second"],
+    "dh%":        [3, 100, "Demand hit percentage"],
+    "dm%":        [3, 100, "Demand miss percentage"],
+    "phit":       [4, 1000, "Prefetch hits per second"],
+    "pmis":       [4, 1000, "Prefetch misses per second"],
+    "ph%":        [3, 100, "Prefetch hits percentage"],
+    "pm%":        [3, 100, "Prefetch miss percentage"],
+    "mhit":       [4, 1000, "Metadata hits per second"],
+    "mmis":       [4, 1000, "Metadata misses per second"],
+    "mread":      [5, 1000, "Metadata accesses per second"],
+    "mh%":        [3, 100, "Metadata hit percentage"],
+    "mm%":        [3, 100, "Metadata miss percentage"],
+    "arcsz":      [5, 1024, "ARC Size"],
+    "c":          [4, 1024, "ARC Target Size"],
+    "mfu":        [4, 1000, "MFU List hits per second"],
+    "mru":        [4, 1000, "MRU List hits per second"],
+    "mfug":       [4, 1000, "MFU Ghost List hits per second"],
+    "mrug":       [4, 1000, "MRU Ghost List hits per second"],
+    "eskip":      [5, 1000, "evict_skip per second"],
+    "mtxmis":     [6, 1000, "mutex_miss per second"],
+    "dread":      [5, 1000, "Demand accesses per second"],
+    "pread":      [5, 1000, "Prefetch accesses per second"],
+    "l2hits":     [6, 1000, "L2ARC hits per second"],
+    "l2miss":     [6, 1000, "L2ARC misses per second"],
+    "l2read":     [6, 1000, "Total L2ARC accesses per second"],
+    "l2hit%":     [6, 100, "L2ARC access hit percentage"],
+    "l2miss%":    [7, 100, "L2ARC access miss percentage"],
+    "l2asize":    [7, 1024, "Actual (compressed) size of the L2ARC"],
+    "l2size":     [6, 1024, "Size of the L2ARC"],
+    "l2bytes":    [7, 1024, "bytes read per second from the L2ARC"],
+    "grow":       [4, 1000, "ARC Grow disabled"],
+    "need":       [4, 1024, "ARC Reclaim need"],
+    "free":       [4, 1024, "ARC Free memory"],
+}
+
+v = {}
+hdr = ["time", "read", "miss", "miss%", "dmis", "dm%", "pmis", "pm%", "mmis",
+       "mm%", "arcsz", "c"]
+xhdr = ["time", "mfu", "mru", "mfug", "mrug", "eskip", "mtxmis", "dread",
+        "pread", "read"]
+sint = 1               # Default interval is 1 second
+count = 1              # Default count is 1
+hdr_intr = 20          # Print header every 20 lines of output
+opfile = None
+sep = "  "              # Default separator is 2 spaces
+version = "0.4"
+l2exist = False
+cmd = ("Usage: arcstat [-hvx] [-f fields] [-o file] [-s string] [interval "
+       "[count]]\n")
+cur = {}
+d = {}
+out = None
+kstat = None
+
+
+def detailed_usage():
+    sys.stderr.write("%s\n" % cmd)
+    sys.stderr.write("Field definitions are as follows:\n")
+    for key in cols:
+        sys.stderr.write("%11s : %s\n" % (key, cols[key][2]))
+    sys.stderr.write("\n")
+
+    sys.exit(0)
+
+
+def usage():
+    sys.stderr.write("%s\n" % cmd)
+    sys.stderr.write("\t -h : Print this help message\n")
+    sys.stderr.write("\t -v : List all possible field headers and definitions"
+                     "\n")
+    sys.stderr.write("\t -x : Print extended stats\n")
+    sys.stderr.write("\t -f : Specify specific fields to print (see -v)\n")
+    sys.stderr.write("\t -o : Redirect output to the specified file\n")
+    sys.stderr.write("\t -s : Override default field separator with custom "
+                     "character or string\n")
+    sys.stderr.write("\nExamples:\n")
+    sys.stderr.write("\tarcstat -o /tmp/a.log 2 10\n")
+    sys.stderr.write("\tarcstat -s \",\" -o /tmp/a.log 2 10\n")
+    sys.stderr.write("\tarcstat -v\n")
+    sys.stderr.write("\tarcstat -f time,hit%,dh%,ph%,mh% 1\n")
+    sys.stderr.write("\n")
+
+    sys.exit(1)
+
+
+def kstat_update():
+    global kstat
+
+    k = [line.strip() for line in open('/proc/spl/kstat/zfs/arcstats')]
+
+    if not k:
+        sys.exit(1)
+
+    del k[0:2]
+    kstat = {}
+
+    for s in k:
+        if not s:
+            continue
+
+        name, unused, value = s.split()
+        kstat[name] = Decimal(value)
+
+
+def snap_stats():
+    global cur
+    global kstat
+
+    prev = copy.deepcopy(cur)
+    kstat_update()
+
+    cur = kstat
+    for key in cur:
+        if re.match(key, "class"):
+            continue
+        if key in prev:
+            d[key] = cur[key] - prev[key]
+        else:
+            d[key] = cur[key]
+
+
+def prettynum(sz, scale, num=0):
+    suffix = [' ', 'K', 'M', 'G', 'T', 'P', 'E', 'Z']
+    index = 0
+    save = 0
+
+    # Special case for date field
+    if scale == -1:
+        return "%s" % num
+
+    # Rounding error, return 0
+    elif 0 < num < 1:
+        num = 0
+
+    while num > scale and index < 5:
+        save = num
+        num = num / scale
+        index += 1
+
+    if index == 0:
+        return "%*d" % (sz, num)
+
+    if (save / scale) < 10:
+        return "%*.1f%s" % (sz - 1, num, suffix[index])
+    else:
+        return "%*d%s" % (sz - 1, num, suffix[index])
+
+
+def print_values():
+    global hdr
+    global sep
+    global v
+
+    for col in hdr:
+        sys.stdout.write("%s%s" % (
+            prettynum(cols[col][0], cols[col][1], v[col]),
+            sep
+        ))
+    sys.stdout.write("\n")
+    sys.stdout.flush()
+
+
+def print_header():
+    global hdr
+    global sep
+
+    for col in hdr:
+        sys.stdout.write("%*s%s" % (cols[col][0], col, sep))
+    sys.stdout.write("\n")
+
+
+def get_terminal_lines():
+    try:
+        import fcntl
+        import termios
+        import struct
+        data = fcntl.ioctl(sys.stdout.fileno(), termios.TIOCGWINSZ, '1234')
+        sz = struct.unpack('hh', data)
+        return sz[0]
+    except Exception:
+        pass
+
+
+def update_hdr_intr():
+    global hdr_intr
+
+    lines = get_terminal_lines()
+    if lines and lines > 3:
+        hdr_intr = lines - 3
+
+
+def resize_handler(signum, frame):
+    update_hdr_intr()
+
+
+def init():
+    global sint
+    global count
+    global hdr
+    global xhdr
+    global opfile
+    global sep
+    global out
+    global l2exist
+
+    desired_cols = None
+    xflag = False
+    hflag = False
+    vflag = False
+    i = 1
+
+    try:
+        opts, args = getopt.getopt(
+            sys.argv[1:],
+            "xo:hvs:f:",
+            [
+                "extended",
+                "outfile",
+                "help",
+                "verbose",
+                "separator",
+                "columns"
+            ]
+        )
+    except getopt.error as msg:
+        sys.stderr.write("Error: %s\n" % str(msg))
+        usage()
+        opts = None
+
+    for opt, arg in opts:
+        if opt in ('-x', '--extended'):
+            xflag = True
+        if opt in ('-o', '--outfile'):
+            opfile = arg
+            i += 1
+        if opt in ('-h', '--help'):
+            hflag = True
+        if opt in ('-v', '--verbose'):
+            vflag = True
+        if opt in ('-s', '--separator'):
+            sep = arg
+            i += 1
+        if opt in ('-f', '--columns'):
+            desired_cols = arg
+            i += 1
+        i += 1
+
+    argv = sys.argv[i:]
+    sint = Decimal(argv[0]) if argv else sint
+    count = int(argv[1]) if len(argv) > 1 else count
+
+    if len(argv) > 1:
+        sint = Decimal(argv[0])
+        count = int(argv[1])
+
+    elif len(argv) > 0:
+        sint = Decimal(argv[0])
+        count = 0
+
+    if hflag or (xflag and desired_cols):
+        usage()
+
+    if vflag:
+        detailed_usage()
+
+    if xflag:
+        hdr = xhdr
+
+    update_hdr_intr()
+
+    # check if L2ARC exists
+    snap_stats()
+    l2_size = cur.get("l2_size")
+    if l2_size:
+        l2exist = True
+
+    if desired_cols:
+        hdr = desired_cols.split(",")
+
+        invalid = []
+        incompat = []
+        for ele in hdr:
+            if ele not in cols:
+                invalid.append(ele)
+            elif not l2exist and ele.startswith("l2"):
+                sys.stdout.write("No L2ARC Here\n%s\n" % ele)
+                incompat.append(ele)
+
+        if len(invalid) > 0:
+            sys.stderr.write("Invalid column definition! -- %s\n" % invalid)
+            usage()
+
+        if len(incompat) > 0:
+            sys.stderr.write("Incompatible field specified! -- %s\n" %
+                             incompat)
+            usage()
+
+    if opfile:
+        try:
+            out = open(opfile, "w")
+            sys.stdout = out
+
+        except IOError:
+            sys.stderr.write("Cannot open %s for writing\n" % opfile)
+            sys.exit(1)
+
+
+def calculate():
+    global d
+    global v
+    global l2exist
+
+    v = dict()
+    v["time"] = time.strftime("%H:%M:%S", time.localtime())
+    v["hits"] = d["hits"] / sint
+    v["miss"] = d["misses"] / sint
+    v["read"] = v["hits"] + v["miss"]
+    v["hit%"] = 100 * v["hits"] / v["read"] if v["read"] > 0 else 0
+    v["miss%"] = 100 - v["hit%"] if v["read"] > 0 else 0
+
+    v["dhit"] = (d["demand_data_hits"] + d["demand_metadata_hits"]) / sint
+    v["dmis"] = (d["demand_data_misses"] + d["demand_metadata_misses"]) / sint
+
+    v["dread"] = v["dhit"] + v["dmis"]
+    v["dh%"] = 100 * v["dhit"] / v["dread"] if v["dread"] > 0 else 0
+    v["dm%"] = 100 - v["dh%"] if v["dread"] > 0 else 0
+
+    v["phit"] = (d["prefetch_data_hits"] + d["prefetch_metadata_hits"]) / sint
+    v["pmis"] = (d["prefetch_data_misses"] +
+                 d["prefetch_metadata_misses"]) / sint
+
+    v["pread"] = v["phit"] + v["pmis"]
+    v["ph%"] = 100 * v["phit"] / v["pread"] if v["pread"] > 0 else 0
+    v["pm%"] = 100 - v["ph%"] if v["pread"] > 0 else 0
+
+    v["mhit"] = (d["prefetch_metadata_hits"] +
+                 d["demand_metadata_hits"]) / sint
+    v["mmis"] = (d["prefetch_metadata_misses"] +
+                 d["demand_metadata_misses"]) / sint
+
+    v["mread"] = v["mhit"] + v["mmis"]
+    v["mh%"] = 100 * v["mhit"] / v["mread"] if v["mread"] > 0 else 0
+    v["mm%"] = 100 - v["mh%"] if v["mread"] > 0 else 0
+
+    v["arcsz"] = cur["size"]
+    v["c"] = cur["c"]
+    v["mfu"] = d["mfu_hits"] / sint
+    v["mru"] = d["mru_hits"] / sint
+    v["mrug"] = d["mru_ghost_hits"] / sint
+    v["mfug"] = d["mfu_ghost_hits"] / sint
+    v["eskip"] = d["evict_skip"] / sint
+    v["mtxmis"] = d["mutex_miss"] / sint
+
+    if l2exist:
+        v["l2hits"] = d["l2_hits"] / sint
+        v["l2miss"] = d["l2_misses"] / sint
+        v["l2read"] = v["l2hits"] + v["l2miss"]
+        v["l2hit%"] = 100 * v["l2hits"] / v["l2read"] if v["l2read"] > 0 else 0
+
+        v["l2miss%"] = 100 - v["l2hit%"] if v["l2read"] > 0 else 0
+        v["l2asize"] = cur["l2_asize"]
+        v["l2size"] = cur["l2_size"]
+        v["l2bytes"] = d["l2_read_bytes"] / sint
+
+    v["grow"] = 0 if cur["arc_no_grow"] else 1
+    v["need"] = cur["arc_need_free"]
+    v["free"] = cur["arc_sys_free"]
+
+
+def main():
+    global sint
+    global count
+    global hdr_intr
+
+    i = 0
+    count_flag = 0
+
+    init()
+    if count > 0:
+        count_flag = 1
+
+    signal(SIGINT, SIG_DFL)
+    signal(SIGWINCH, resize_handler)
+    while True:
+        if i == 0:
+            print_header()
+
+        snap_stats()
+        calculate()
+        print_values()
+
+        if count_flag == 1:
+            if count <= 1:
+                break
+            count -= 1
+
+        i = 0 if i >= hdr_intr else i + 1
+        time.sleep(sint)
+
+    if out:
+        out.close()
+
+
+if __name__ == '__main__':
+    main()

cmd/dbufstat/Makefile.am

@@ -0,0 +1,13 @@
+dist_bin_SCRIPTS = dbufstat
+
+#
+# The dbufstat script is compatibile with both Python 2.6 and 3.4.
+# As such the python 3 shebang can be replaced at install time when
+# targeting a python 2 system.  This allows us to maintain a single
+# version of the source.
+#
+if USING_PYTHON_2
+install-exec-hook:
+	sed --in-place 's|^#!/usr/bin/python3|#!/usr/bin/python2|' \
+	    $(DESTDIR)$(bindir)/dbufstat
+endif

cmd/dbufstat/dbufstat

@@ -1,5 +1,4 @@
-#!/usr/bin/env @PYTHON_SHEBANG@
-# SPDX-License-Identifier: CDDL-1.0
+#!/usr/bin/python3
 #
 # Print out statistics for all cached dmu buffers.  This information
 # is available through the dbufs kstat and may be post-processed as
@@ -13,7 +12,7 @@
 # with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or https://opensource.org/licenses/CDDL-1.0.
+# or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
@@ -28,7 +27,7 @@
 # Copyright (C) 2013 Lawrence Livermore National Security, LLC.
 # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 #
-# This script must remain compatible with and Python 3.6+.
+# This script must remain compatible with Python 2.6+ and Python 3.4+.
 #
 
 import sys
@@ -38,7 +37,7 @@ import re
 
 bhdr = ["pool", "objset", "object", "level", "blkid", "offset", "dbsize"]
 bxhdr = ["pool", "objset", "object", "level", "blkid", "offset", "dbsize",
-         "usize", "meta", "state", "dbholds", "dbc", "list", "atype", "flags",
+         "meta", "state", "dbholds", "dbc", "list", "atype", "flags",
          "count", "asize", "access", "mru", "gmru", "mfu", "gmfu", "l2",
          "l2_dattr", "l2_asize", "l2_comp", "aholds", "dtype", "btype",
          "data_bs", "meta_bs", "bsize", "lvls", "dholds", "blocks", "dsize"]
@@ -48,17 +47,17 @@ dhdr = ["pool", "objset", "object", "dtype", "cached"]
 dxhdr = ["pool", "objset", "object", "dtype", "btype", "data_bs", "meta_bs",
          "bsize", "lvls", "dholds", "blocks", "dsize", "cached", "direct",
          "indirect", "bonus", "spill"]
-dincompat = ["level", "blkid", "offset", "dbsize", "usize", "meta", "state",
-             "dbholds", "dbc", "list", "atype", "flags", "count", "asize",
-             "access", "mru", "gmru", "mfu", "gmfu", "l2", "l2_dattr",
-             "l2_asize", "l2_comp", "aholds"]
+dincompat = ["level", "blkid", "offset", "dbsize", "meta", "state", "dbholds",
+             "dbc", "list", "atype", "flags", "count", "asize", "access",
+             "mru", "gmru", "mfu", "gmfu", "l2", "l2_dattr", "l2_asize",
+             "l2_comp", "aholds"]
 
 thdr = ["pool", "objset", "dtype", "cached"]
 txhdr = ["pool", "objset", "dtype", "cached", "direct", "indirect",
          "bonus", "spill"]
-tincompat = ["object", "level", "blkid", "offset", "dbsize", "usize", "meta",
-             "state", "dbc", "dbholds", "list", "atype", "flags", "count",
-             "asize", "access", "mru", "gmru", "mfu", "gmfu", "l2", "l2_dattr",
+tincompat = ["object", "level", "blkid", "offset", "dbsize", "meta", "state",
+             "dbc", "dbholds", "list", "atype", "flags", "count", "asize",
+             "access", "mru", "gmru", "mfu", "gmfu", "l2", "l2_dattr",
              "l2_asize", "l2_comp", "aholds", "btype", "data_bs", "meta_bs",
              "bsize", "lvls", "dholds", "blocks", "dsize"]
 
@@ -71,7 +70,6 @@ cols = {
     "blkid":      [8,    -1, "block number of buffer"],
     "offset":     [12, 1024, "offset in object of buffer"],
     "dbsize":     [7,  1024, "size of buffer"],
-    "usize":      [7,  1024, "size of attached user data"],
     "meta":       [4,    -1, "is this buffer metadata?"],
     "state":      [5,    -1, "state of buffer (read, cached, etc)"],
     "dbholds":    [7,  1000, "number of holds on buffer"],
@@ -115,25 +113,10 @@ cmd = ("Usage: dbufstat [-bdhnrtvx] [-i file] [-f fields] [-o file] "
 raw = 0
 
 
-if sys.platform.startswith("freebsd"):
-    import io
-    # Requires py-sysctl on FreeBSD
-    import sysctl
-
-    def default_ifile():
-        dbufs = sysctl.filter("kstat.zfs.misc.dbufs")[0].value
-        sys.stdin = io.StringIO(dbufs)
-        return "-"
-
-elif sys.platform.startswith("linux"):
-    def default_ifile():
-        return "/proc/spl/kstat/zfs/dbufs"
-
-
 def print_incompat_helper(incompat):
     cnt = 0
     for key in sorted(incompat):
-        if cnt == 0:
+        if cnt is 0:
             sys.stderr.write("\t")
         elif cnt > 8:
             sys.stderr.write(",\n\t")
@@ -360,7 +343,7 @@ def get_compstring(c):
                     "ZIO_COMPRESS_GZIP_6",  "ZIO_COMPRESS_GZIP_7",
                     "ZIO_COMPRESS_GZIP_8",  "ZIO_COMPRESS_GZIP_9",
                     "ZIO_COMPRESS_ZLE",     "ZIO_COMPRESS_LZ4",
-                    "ZIO_COMPRESS_ZSTD",    "ZIO_COMPRESS_FUNCTION"]
+                    "ZIO_COMPRESS_FUNCTION"]
 
     # If "-rr" option is used, don't convert to string representation
     if raw > 1:
@@ -401,7 +384,6 @@ def update_dict(d, k, line, labels):
     key = line[labels[k]]
 
     dbsize = int(line[labels['dbsize']])
-    usize = int(line[labels['usize']])
     blkid = int(line[labels['blkid']])
     level = int(line[labels['level']])
 
@@ -419,7 +401,7 @@ def update_dict(d, k, line, labels):
         d[pool][objset][key]['indirect'] = 0
         d[pool][objset][key]['spill'] = 0
 
-    d[pool][objset][key]['cached'] += dbsize + usize
+    d[pool][objset][key]['cached'] += dbsize
 
     if blkid == -1:
         d[pool][objset][key]['bonus'] += dbsize
@@ -663,9 +645,9 @@ def main():
             sys.exit(1)
 
     if not ifile:
-        ifile = default_ifile()
+        ifile = '/proc/spl/kstat/zfs/dbufs'
 
-    if ifile != "-":
+    if ifile is not "-":
         try:
             tmp = open(ifile, "r")
             sys.stdin = tmp

cmd/fsck.zfs.in

@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# fsck.zfs: A fsck helper to accommodate distributions that expect
-# to be able to execute a fsck on all filesystem types.
-#
-# This script simply bubbles up some already-known-about errors,
-# see fsck.zfs(8)
-#
-
-if [ $# -eq 0 ]; then
-	echo "Usage: $0 [options] dataset…" >&2
-	exit 16
-fi
-
-ret=0
-for dataset; do
-	case "$dataset" in
-		-*)
-			continue
-			;;
-		*)
-			;;
-	esac
-
-	pool="${dataset%%/*}"
-
-	case "$(@sbindir@/zpool list -Ho health "$pool")" in
-		DEGRADED)
-			ret=$(( ret | 4 ))
-			;;
-		FAULTED)
-			awk '!/^([[:space:]]*#.*)?$/ && $1 == "'"$dataset"'" && $3 == "zfs" {exit 1}' /etc/fstab || \
-				ret=$(( ret | 8 ))
-			;;
-		"")
-			# Pool not found, error printed by zpool(8)
-			ret=$(( ret | 8 ))
-			;;
-		*)
-			;;
-	esac
-done
-
-exit "$ret"

cmd/fsck_zfs/Makefile.am

@@ -0,0 +1 @@
+dist_sbin_SCRIPTS = fsck.zfs

cmd/fsck_zfs/fsck.zfs

@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# fsck.zfs: A fsck helper to accomidate distributions that expect
+# to be able to execute a fsck on all filesystem types.  Currently
+# this script does nothing but it could be extended to act as a
+# compatibility wrapper for 'zpool scrub'.
+#
+
+exit 0

cmd/mount_zfs/.gitignore

@@ -0,0 +1 @@
+mount.zfs

cmd/mount_zfs/Makefile.am

@@ -0,0 +1,21 @@
+include $(top_srcdir)/config/Rules.am
+
+DEFAULT_INCLUDES += \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/lib/libspl/include
+
+#
+# Ignore the prefix for the mount helper.  It must be installed in /sbin/
+# because this path is hardcoded in the mount(8) for security reasons.
+# However, if needed, the configure option --with-mounthelperdir= can be used
+# to override the default install location.
+#
+sbindir=$(mounthelperdir)
+sbin_PROGRAMS = mount.zfs
+
+mount_zfs_SOURCES = \
+	mount_zfs.c
+
+mount_zfs_LDADD = \
+	$(top_builddir)/lib/libnvpair/libnvpair.la \
+	$(top_builddir)/lib/libzfs/libzfs.la

cmd/mount_zfs/mount_zfs.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -7,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 https://opensource.org/licenses/CDDL-1.0.
+ * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
@@ -43,46 +42,247 @@
 
 libzfs_handle_t *g_zfs;
 
+typedef struct option_map {
+	const char *name;
+	unsigned long mntmask;
+	unsigned long zfsmask;
+} option_map_t;
+
+static const option_map_t option_map[] = {
+	/* Canonicalized filesystem independent options from mount(8) */
+	{ MNTOPT_NOAUTO,	MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_DEFAULTS,	MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_NODEVICES,	MS_NODEV,	ZS_COMMENT	},
+	{ MNTOPT_DIRSYNC,	MS_DIRSYNC,	ZS_COMMENT	},
+	{ MNTOPT_NOEXEC,	MS_NOEXEC,	ZS_COMMENT	},
+	{ MNTOPT_GROUP,		MS_GROUP,	ZS_COMMENT	},
+	{ MNTOPT_NETDEV,	MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_NOFAIL,	MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_NOSUID,	MS_NOSUID,	ZS_COMMENT	},
+	{ MNTOPT_OWNER,		MS_OWNER,	ZS_COMMENT	},
+	{ MNTOPT_REMOUNT,	MS_REMOUNT,	ZS_COMMENT	},
+	{ MNTOPT_RO,		MS_RDONLY,	ZS_COMMENT	},
+	{ MNTOPT_RW,		MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_SYNC,		MS_SYNCHRONOUS,	ZS_COMMENT	},
+	{ MNTOPT_USER,		MS_USERS,	ZS_COMMENT	},
+	{ MNTOPT_USERS,		MS_USERS,	ZS_COMMENT	},
+	/* acl flags passed with util-linux-2.24 mount command */
+	{ MNTOPT_ACL,		MS_POSIXACL,	ZS_COMMENT	},
+	{ MNTOPT_NOACL,		MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_POSIXACL,	MS_POSIXACL,	ZS_COMMENT	},
+#ifdef MS_NOATIME
+	{ MNTOPT_NOATIME,	MS_NOATIME,	ZS_COMMENT	},
+#endif
+#ifdef MS_NODIRATIME
+	{ MNTOPT_NODIRATIME,	MS_NODIRATIME,	ZS_COMMENT	},
+#endif
+#ifdef MS_RELATIME
+	{ MNTOPT_RELATIME,	MS_RELATIME,	ZS_COMMENT	},
+#endif
+#ifdef MS_STRICTATIME
+	{ MNTOPT_STRICTATIME,	MS_STRICTATIME,	ZS_COMMENT	},
+#endif
+#ifdef MS_LAZYTIME
+	{ MNTOPT_LAZYTIME,	MS_LAZYTIME,	ZS_COMMENT	},
+#endif
+	{ MNTOPT_CONTEXT,	MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_FSCONTEXT,	MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_DEFCONTEXT,	MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_ROOTCONTEXT,	MS_COMMENT,	ZS_COMMENT	},
+#ifdef MS_I_VERSION
+	{ MNTOPT_IVERSION,	MS_I_VERSION,	ZS_COMMENT	},
+#endif
+#ifdef MS_MANDLOCK
+	{ MNTOPT_NBMAND,	MS_MANDLOCK,	ZS_COMMENT	},
+#endif
+	/* Valid options not found in mount(8) */
+	{ MNTOPT_BIND,		MS_BIND,	ZS_COMMENT	},
+#ifdef MS_REC
+	{ MNTOPT_RBIND,		MS_BIND|MS_REC,	ZS_COMMENT	},
+#endif
+	{ MNTOPT_COMMENT,	MS_COMMENT,	ZS_COMMENT	},
+#ifdef MS_NOSUB
+	{ MNTOPT_NOSUB,		MS_NOSUB,	ZS_COMMENT	},
+#endif
+#ifdef MS_SILENT
+	{ MNTOPT_QUIET,		MS_SILENT,	ZS_COMMENT	},
+#endif
+	/* Custom zfs options */
+	{ MNTOPT_XATTR,		MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_NOXATTR,	MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_ZFSUTIL,	MS_COMMENT,	ZS_ZFSUTIL	},
+	{ NULL,			0,		0		} };
+
 /*
- * Opportunistically convert a target string into a pool name. If the
- * string does not represent a block device with a valid zfs label
- * then it is passed through without modification.
+ * Break the mount option in to a name/value pair.  The name is
+ * validated against the option map and mount flags set accordingly.
  */
-static void
-parse_dataset(const char *target, char **dataset)
+static int
+parse_option(char *mntopt, unsigned long *mntflags,
+    unsigned long *zfsflags, int sloppy)
 {
+	const option_map_t *opt;
+	char *ptr, *name, *value = NULL;
+	int error = 0;
+
+	name = strdup(mntopt);
+	if (name == NULL)
+		return (ENOMEM);
+
+	for (ptr = name; ptr && *ptr; ptr++) {
+		if (*ptr == '=') {
+			*ptr = '\0';
+			value = ptr+1;
+			VERIFY3P(value, !=, NULL);
+			break;
+		}
+	}
+
+	for (opt = option_map; opt->name != NULL; opt++) {
+		if (strncmp(name, opt->name, strlen(name)) == 0) {
+			*mntflags |= opt->mntmask;
+			*zfsflags |= opt->zfsmask;
+			error = 0;
+			goto out;
+		}
+	}
+
+	if (!sloppy)
+		error = ENOENT;
+out:
+	/* If required further process on the value may be done here */
+	free(name);
+	return (error);
+}
+
+/*
+ * Translate the mount option string in to MS_* mount flags for the
+ * kernel vfs.  When sloppy is non-zero unknown options will be ignored
+ * otherwise they are considered fatal are copied in to badopt.
+ */
+static int
+parse_options(char *mntopts, unsigned long *mntflags, unsigned long *zfsflags,
+    int sloppy, char *badopt, char *mtabopt)
+{
+	int error = 0, quote = 0, flag = 0, count = 0;
+	char *ptr, *opt, *opts;
+
+	opts = strdup(mntopts);
+	if (opts == NULL)
+		return (ENOMEM);
+
+	*mntflags = 0;
+	opt = NULL;
+
 	/*
-	 * Prior to util-linux 2.36.2, if a file or directory in the
-	 * current working directory was named 'dataset' then mount(8)
-	 * would prepend the current working directory to the dataset.
-	 * Check for it and strip the prepended path when it is added.
+	 * Scan through all mount options which must be comma delimited.
+	 * We must be careful to notice regions which are double quoted
+	 * and skip commas in these regions.  Each option is then checked
+	 * to determine if it is a known option.
 	 */
+	for (ptr = opts; ptr && !flag; ptr++) {
+		if (opt == NULL)
+			opt = ptr;
+
+		if (*ptr == '"')
+			quote = !quote;
+
+		if (quote)
+			continue;
+
+		if (*ptr == '\0')
+			flag = 1;
+
+		if ((*ptr == ',') || (*ptr == '\0')) {
+			*ptr = '\0';
+
+			error = parse_option(opt, mntflags, zfsflags, sloppy);
+			if (error) {
+				strcpy(badopt, opt);
+				goto out;
+
+			}
+
+			if (!(*mntflags & MS_REMOUNT) &&
+			    !(*zfsflags & ZS_ZFSUTIL)) {
+				if (count > 0)
+					strlcat(mtabopt, ",", MNT_LINE_MAX);
+
+				strlcat(mtabopt, opt, MNT_LINE_MAX);
+				count++;
+			}
+
+			opt = NULL;
+		}
+	}
+
+out:
+	free(opts);
+	return (error);
+}
+
+/*
+ * Return the pool/dataset to mount given the name passed to mount.  This
+ * is expected to be of the form pool/dataset, however may also refer to
+ * a block device if that device contains a valid zfs label.
+ */
+static char *
+parse_dataset(char *dataset)
+{
 	char cwd[PATH_MAX];
-	if (getcwd(cwd, PATH_MAX) == NULL) {
-		perror("getcwd");
-		return;
+	struct stat64 statbuf;
+	int error;
+	int len;
+
+	/*
+	 * We expect a pool/dataset to be provided, however if we're
+	 * given a device which is a member of a zpool we attempt to
+	 * extract the pool name stored in the label.  Given the pool
+	 * name we can mount the root dataset.
+	 */
+	error = stat64(dataset, &statbuf);
+	if (error == 0) {
+		nvlist_t *config;
+		char *name;
+		int fd;
+
+		fd = open(dataset, O_RDONLY);
+		if (fd < 0)
+			goto out;
+
+		error = zpool_read_label(fd, &config, NULL);
+		(void) close(fd);
+		if (error)
+			goto out;
+
+		error = nvlist_lookup_string(config,
+		    ZPOOL_CONFIG_POOL_NAME, &name);
+		if (error) {
+			nvlist_free(config);
+		} else {
+			dataset = strdup(name);
+			nvlist_free(config);
+			return (dataset);
+		}
 	}
-	int len = strlen(cwd);
-	if (strncmp(cwd, target, len) == 0)
-		target += len;
+out:
+	/*
+	 * If a file or directory in your current working directory is
+	 * named 'dataset' then mount(8) will prepend your current working
+	 * directory to the dataset.  There is no way to prevent this
+	 * behavior so we simply check for it and strip the prepended
+	 * patch when it is added.
+	 */
+	if (getcwd(cwd, PATH_MAX) == NULL)
+		return (dataset);
 
-	/* Assume pool/dataset is more likely */
-	strlcpy(*dataset, target, PATH_MAX);
+	len = strlen(cwd);
 
-	int fd = open(target, O_RDONLY | O_CLOEXEC);
-	if (fd < 0)
-		return;
+	/* Do not add one when cwd already ends in a trailing '/' */
+	if (strncmp(cwd, dataset, len) == 0)
+		return (dataset + len + (cwd[len-1] != '/'));
 
-	nvlist_t *cfg = NULL;
-	if (zpool_read_label(fd, &cfg, NULL) == 0) {
-		const char *nm = NULL;
-		if (!nvlist_lookup_string(cfg, ZPOOL_CONFIG_POOL_NAME, &nm))
-			strlcpy(*dataset, nm, PATH_MAX);
-		nvlist_free(cfg);
-	}
-
-	if (close(fd))
-		perror("close");
+	return (dataset);
 }
 
 /*
@@ -109,26 +309,25 @@ mtab_is_writeable(void)
 }
 
 static int
-mtab_update(const char *dataset, const char *mntpoint, const char *type,
-    const char *mntopts)
+mtab_update(char *dataset, char *mntpoint, char *type, char *mntopts)
 {
 	struct mntent mnt;
 	FILE *fp;
 	int error;
 
-	mnt.mnt_fsname = (char *)dataset;
-	mnt.mnt_dir = (char *)mntpoint;
-	mnt.mnt_type = (char *)type;
-	mnt.mnt_opts = (char *)(mntopts ?: "");
+	mnt.mnt_fsname = dataset;
+	mnt.mnt_dir = mntpoint;
+	mnt.mnt_type = type;
+	mnt.mnt_opts = mntopts ? mntopts : "";
 	mnt.mnt_freq = 0;
 	mnt.mnt_passno = 0;
 
-	fp = setmntent("/etc/mtab", "a+e");
+	fp = setmntent("/etc/mtab", "a+");
 	if (!fp) {
 		(void) fprintf(stderr, gettext(
 		    "filesystem '%s' was mounted, but /etc/mtab "
-		    "could not be opened due to error: %s\n"),
-		    dataset, strerror(errno));
+		    "could not be opened due to error %d\n"),
+		    dataset, errno);
 		return (MOUNT_FILEIO);
 	}
 
@@ -136,8 +335,8 @@ mtab_update(const char *dataset, const char *mntpoint, const char *type,
 	if (error) {
 		(void) fprintf(stderr, gettext(
 		    "filesystem '%s' was mounted, but /etc/mtab "
-		    "could not be updated due to error: %s\n"),
-		    dataset, strerror(errno));
+		    "could not be updated due to error %d\n"),
+		    dataset, errno);
 		return (MOUNT_FILEIO);
 	}
 
@@ -146,6 +345,34 @@ mtab_update(const char *dataset, const char *mntpoint, const char *type,
 	return (MOUNT_SUCCESS);
 }
 
+static void
+append_mntopt(const char *name, const char *val, char *mntopts,
+    char *mtabopt, boolean_t quote)
+{
+	char tmp[MNT_LINE_MAX];
+
+	snprintf(tmp, MNT_LINE_MAX, quote ? ",%s=\"%s\"" : ",%s=%s", name, val);
+
+	if (mntopts)
+		strlcat(mntopts, tmp, MNT_LINE_MAX);
+
+	if (mtabopt)
+		strlcat(mtabopt, tmp, MNT_LINE_MAX);
+}
+
+static void
+zfs_selinux_setcontext(zfs_handle_t *zhp, zfs_prop_t zpt, const char *name,
+    char *mntopts, char *mtabopt)
+{
+	char context[ZFS_MAXPROPLEN];
+
+	if (zfs_prop_get(zhp, zpt, context, sizeof (context),
+	    NULL, NULL, 0, B_FALSE) == 0) {
+		if (strcmp(context, "none") != 0)
+			append_mntopt(name, context, mntopts, mtabopt, B_TRUE);
+	}
+}
+
 int
 main(int argc, char **argv)
 {
@@ -156,13 +383,12 @@ main(int argc, char **argv)
 	char badopt[MNT_LINE_MAX] = { '\0' };
 	char mtabopt[MNT_LINE_MAX] = { '\0' };
 	char mntpoint[PATH_MAX];
-	char dataset[PATH_MAX], *pdataset = dataset;
+	char *dataset;
 	unsigned long mntflags = 0, zfsflags = 0, remount = 0;
 	int sloppy = 0, fake = 0, verbose = 0, nomtab = 0, zfsutil = 0;
 	int error, c;
 
 	(void) setlocale(LC_ALL, "");
-	(void) setlocale(LC_NUMERIC, "C");
 	(void) textdomain(TEXT_DOMAIN);
 
 	opterr = 0;
@@ -187,11 +413,10 @@ main(int argc, char **argv)
 			break;
 		case 'h':
 		case '?':
-			if (optopt)
-				(void) fprintf(stderr,
-				    gettext("Invalid option '%c'\n"), optopt);
+			(void) fprintf(stderr, gettext("Invalid option '%c'\n"),
+			    optopt);
 			(void) fprintf(stderr, gettext("Usage: mount.zfs "
-			    "[-sfnvh] [-o options] <dataset> <mountpoint>\n"));
+			    "[-sfnv] [-o options] <dataset> <mountpoint>\n"));
 			return (MOUNT_USAGE);
 		}
 	}
@@ -213,18 +438,18 @@ main(int argc, char **argv)
 		return (MOUNT_USAGE);
 	}
 
-	parse_dataset(argv[0], &pdataset);
+	dataset = parse_dataset(argv[0]);
 
 	/* canonicalize the mount point */
 	if (realpath(argv[1], mntpoint) == NULL) {
 		(void) fprintf(stderr, gettext("filesystem '%s' cannot be "
-		    "mounted at '%s' due to canonicalization error: %s\n"),
-		    dataset, argv[1], strerror(errno));
+		    "mounted at '%s' due to canonicalization error %d.\n"),
+		    dataset, argv[1], errno);
 		return (MOUNT_SYSERR);
 	}
 
 	/* validate mount options and set mntflags */
-	error = zfs_parse_mount_options(mntopts, &mntflags, &zfsflags, sloppy,
+	error = parse_options(mntopts, &mntflags, &zfsflags, sloppy,
 	    badopt, mtabopt);
 	if (error) {
 		switch (error) {
@@ -248,6 +473,13 @@ main(int argc, char **argv)
 		}
 	}
 
+	if (verbose)
+		(void) fprintf(stdout, gettext("mount.zfs:\n"
+		    "  dataset:    \"%s\"\n  mountpoint: \"%s\"\n"
+		    "  mountflags: 0x%lx\n  zfsflags:   0x%lx\n"
+		    "  mountopts:  \"%s\"\n  mtabopts:   \"%s\"\n"),
+		    dataset, mntpoint, mntflags, zfsflags, mntopts, mtabopt);
+
 	if (mntflags & MS_REMOUNT) {
 		nomtab = 1;
 		remount = 1;
@@ -257,7 +489,7 @@ main(int argc, char **argv)
 		zfsutil = 1;
 
 	if ((g_zfs = libzfs_init()) == NULL) {
-		(void) fprintf(stderr, "%s\n", libzfs_error_init(errno));
+		(void) fprintf(stderr, "%s", libzfs_error_init(errno));
 		return (MOUNT_SYSERR);
 	}
 
@@ -270,10 +502,33 @@ main(int argc, char **argv)
 		return (MOUNT_USAGE);
 	}
 
-	if (sloppy || libzfs_envvar_is_set("ZFS_MOUNT_HELPER")) {
-		zfs_adjust_mount_options(zhp, mntpoint, mntopts, mtabopt);
+	/*
+	 * Checks to see if the ZFS_PROP_SELINUX_CONTEXT exists
+	 * if it does, create a tmp variable in case it's needed
+	 * checks to see if the selinux context is set to the default
+	 * if it is, allow the setting of the other context properties
+	 * this is needed because the 'context' property overrides others
+	 * if it is not the default, set the 'context' property
+	 */
+	if (zfs_prop_get(zhp, ZFS_PROP_SELINUX_CONTEXT, prop, sizeof (prop),
+	    NULL, NULL, 0, B_FALSE) == 0) {
+		if (strcmp(prop, "none") == 0) {
+			zfs_selinux_setcontext(zhp, ZFS_PROP_SELINUX_FSCONTEXT,
+			    MNTOPT_FSCONTEXT, mntopts, mtabopt);
+			zfs_selinux_setcontext(zhp, ZFS_PROP_SELINUX_DEFCONTEXT,
+			    MNTOPT_DEFCONTEXT, mntopts, mtabopt);
+			zfs_selinux_setcontext(zhp,
+			    ZFS_PROP_SELINUX_ROOTCONTEXT, MNTOPT_ROOTCONTEXT,
+			    mntopts, mtabopt);
+		} else {
+			append_mntopt(MNTOPT_CONTEXT, prop,
+			    mntopts, mtabopt, B_TRUE);
+		}
 	}
 
+	/* A hint used to determine an auto-mounted snapshot mount point */
+	append_mntopt(MNTOPT_MNTPOINT, mntpoint, mntopts, NULL, B_FALSE);
+
 	/* treat all snapshots as legacy mount points */
 	if (zfs_get_type(zhp) == ZFS_TYPE_SNAPSHOT)
 		(void) strlcpy(prop, ZFS_MOUNTPOINT_LEGACY, ZFS_MAXPROPLEN);
@@ -290,11 +545,12 @@ main(int argc, char **argv)
 	if (zfs_version == 0) {
 		fprintf(stderr, gettext("unable to fetch "
 		    "ZFS version for filesystem '%s'\n"), dataset);
-		zfs_close(zhp);
-		libzfs_fini(g_zfs);
 		return (MOUNT_SYSERR);
 	}
 
+	zfs_close(zhp);
+	libzfs_fini(g_zfs);
+
 	/*
 	 * Legacy mount points may only be mounted using 'mount', never using
 	 * 'zfs mount'.  However, since 'zfs mount' actually invokes 'mount'
@@ -312,8 +568,6 @@ main(int argc, char **argv)
 		    "Use 'zfs set mountpoint=%s' or 'mount -t zfs %s %s'.\n"
 		    "See zfs(8) for more information.\n"),
 		    dataset, mntpoint, dataset, mntpoint);
-		zfs_close(zhp);
-		libzfs_fini(g_zfs);
 		return (MOUNT_USAGE);
 	}
 
@@ -324,38 +578,14 @@ main(int argc, char **argv)
 		    "Use 'zfs set mountpoint=%s' or 'zfs mount %s'.\n"
 		    "See zfs(8) for more information.\n"),
 		    dataset, "legacy", dataset);
-		zfs_close(zhp);
-		libzfs_fini(g_zfs);
 		return (MOUNT_USAGE);
 	}
 
-	if (verbose)
-		(void) fprintf(stdout, gettext("mount.zfs:\n"
-		    "  dataset:    \"%s\"\n  mountpoint: \"%s\"\n"
-		    "  mountflags: 0x%lx\n  zfsflags:   0x%lx\n"
-		    "  mountopts:  \"%s\"\n  mtabopts:   \"%s\"\n"),
-		    dataset, mntpoint, mntflags, zfsflags, mntopts, mtabopt);
-
 	if (!fake) {
-		if (!remount && !sloppy &&
-		    !libzfs_envvar_is_set("ZFS_MOUNT_HELPER")) {
-			error = zfs_mount_at(zhp, mntopts, mntflags, mntpoint);
-			if (error) {
-				(void) fprintf(stderr, "zfs_mount_at() failed: "
-				    "%s", libzfs_error_description(g_zfs));
-				zfs_close(zhp);
-				libzfs_fini(g_zfs);
-				return (MOUNT_SYSERR);
-			}
-		} else {
-			error = mount(dataset, mntpoint, MNTTYPE_ZFS,
-			    mntflags, mntopts);
-		}
+		error = mount(dataset, mntpoint, MNTTYPE_ZFS,
+		    mntflags, mntopts);
 	}
 
-	zfs_close(zhp);
-	libzfs_fini(g_zfs);
-
 	if (error) {
 		switch (errno) {
 		case ENOENT:
@@ -390,8 +620,8 @@ main(int argc, char **argv)
 				    "mount the filesystem again.\n"), dataset);
 				return (MOUNT_SYSERR);
 			}
+			/* fallthru */
 #endif
-			zfs_fallthrough;
 		default:
 			(void) fprintf(stderr, gettext("filesystem "
 			    "'%s' can not be mounted: %s\n"), dataset,

cmd/raidz_test/.gitignore

@@ -0,0 +1 @@
+/raidz_test

cmd/raidz_test/Makefile.am

@@ -1,16 +1,23 @@
-raidz_test_CFLAGS   = $(AM_CFLAGS)   $(KERNEL_CFLAGS)
-raidz_test_CPPFLAGS = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
+include $(top_srcdir)/config/Rules.am
 
-bin_PROGRAMS    += raidz_test
-CPPCHECKTARGETS += raidz_test
+# Includes kernel code, generate warnings for large stack frames
+AM_CFLAGS += $(FRAME_LARGER_THAN)
+
+# Unconditionally enable ASSERTs
+AM_CPPFLAGS += -DDEBUG -UNDEBUG
+
+DEFAULT_INCLUDES += \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/lib/libspl/include
+
+bin_PROGRAMS = raidz_test
 
 raidz_test_SOURCES = \
-	%D%/raidz_bench.c \
-	%D%/raidz_test.c \
-	%D%/raidz_test.h
+	raidz_test.h \
+	raidz_test.c \
+	raidz_bench.c
 
 raidz_test_LDADD = \
-	libzpool.la \
-	libzfs_core.la
+	$(top_builddir)/lib/libzpool/libzpool.la
 
-raidz_test_LDADD += -lm
+raidz_test_LDADD += -lm -ldl

cmd/raidz_test/raidz_bench.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -7,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 https://opensource.org/licenses/CDDL-1.0.
+ * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
@@ -32,6 +31,8 @@
 #include <sys/vdev_raidz_impl.h>
 #include <stdio.h>
 
+#include <sys/time.h>
+
 #include "raidz_test.h"
 
 #define	GEN_BENCH_MEMORY	(((uint64_t)1ULL)<<32)
@@ -64,7 +65,7 @@ bench_fini_raidz_maps(void)
 {
 	/* tear down golden zio */
 	raidz_free(zio_bench.io_abd, max_data_size);
-	memset(&zio_bench, 0, sizeof (zio_t));
+	bzero(&zio_bench, sizeof (zio_t));
 }
 
 static inline void
@@ -82,17 +83,8 @@ run_gen_bench_impl(const char *impl)
 			/* create suitable raidz_map */
 			ncols = rto_opts.rto_dcols + fn + 1;
 			zio_bench.io_size = 1ULL << ds;
-
-			if (rto_opts.rto_expand) {
-				rm_bench = vdev_raidz_map_alloc_expanded(
-				    &zio_bench,
-				    rto_opts.rto_ashift, ncols+1, ncols,
-				    fn+1, rto_opts.rto_expand_offset,
-				    0, B_FALSE);
-			} else {
-				rm_bench = vdev_raidz_map_alloc(&zio_bench,
-				    BENCH_ASHIFT, ncols, fn+1);
-			}
+			rm_bench = vdev_raidz_map_alloc(&zio_bench,
+			    BENCH_ASHIFT, ncols, fn+1);
 
 			/* estimate iteration count */
 			iter_cnt = GEN_BENCH_MEMORY;
@@ -121,7 +113,7 @@ run_gen_bench_impl(const char *impl)
 	}
 }
 
-static void
+void
 run_gen_bench(void)
 {
 	char **impl_name;
@@ -171,16 +163,8 @@ run_rec_bench_impl(const char *impl)
 			    (1ULL << BENCH_ASHIFT))
 				continue;
 
-			if (rto_opts.rto_expand) {
-				rm_bench = vdev_raidz_map_alloc_expanded(
-				    &zio_bench,
-				    BENCH_ASHIFT, ncols+1, ncols,
-				    PARITY_PQR,
-				    rto_opts.rto_expand_offset, 0, B_FALSE);
-			} else {
-				rm_bench = vdev_raidz_map_alloc(&zio_bench,
-				    BENCH_ASHIFT, ncols, PARITY_PQR);
-			}
+			rm_bench = vdev_raidz_map_alloc(&zio_bench,
+			    BENCH_ASHIFT, ncols, PARITY_PQR);
 
 			/* estimate iteration count */
 			iter_cnt = (REC_BENCH_MEMORY);
@@ -213,7 +197,7 @@ run_rec_bench_impl(const char *impl)
 	}
 }
 
-static void
+void
 run_rec_bench(void)
 {
 	char **impl_name;

cmd/raidz_test/raidz_test.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -7,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 https://opensource.org/licenses/CDDL-1.0.
+ * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
@@ -38,11 +37,11 @@
 static int *rand_data;
 raidz_test_opts_t rto_opts;
 
-static char pid_s[16];
+static char gdb[256];
+static const char gdb_tmpl[] = "gdb -ex \"set pagination 0\" -p %d";
 
 static void sig_handler(int signo)
 {
-	int old_errno = errno;
 	struct sigaction action;
 	/*
 	 * Restore default action and re-raise signal so SIGSEGV and
@@ -53,32 +52,22 @@ static void sig_handler(int signo)
 	action.sa_flags = 0;
 	(void) sigaction(signo, &action, NULL);
 
-	if (rto_opts.rto_gdb) {
-		pid_t pid = fork();
-		if (pid == 0) {
-			execlp("gdb", "gdb", "-ex", "set pagination 0",
-			    "-p", pid_s, NULL);
-			_exit(-1);
-		} else if (pid > 0)
-			while (waitpid(pid, NULL, 0) == -1 && errno == EINTR)
-				;
-	}
+	if (rto_opts.rto_gdb)
+		if (system(gdb)) { }
 
 	raise(signo);
-	errno = old_errno;
 }
 
 static void print_opts(raidz_test_opts_t *opts, boolean_t force)
 {
-	const char *verbose;
+	char *verbose;
 	switch (opts->rto_v) {
-		case D_ALL:
+		case 0:
 			verbose = "no";
 			break;
-		case D_INFO:
+		case 1:
 			verbose = "info";
 			break;
-		case D_DEBUG:
 		default:
 			verbose = "debug";
 			break;
@@ -88,20 +77,16 @@ static void print_opts(raidz_test_opts_t *opts, boolean_t force)
 		(void) fprintf(stdout, DBLSEP "Running with options:\n"
 		    "  (-a) zio ashift                   : %zu\n"
 		    "  (-o) zio offset                   : 1 << %zu\n"
-		    "  (-e) expanded map                 : %s\n"
-		    "  (-r) reflow offset                : %llx\n"
 		    "  (-d) number of raidz data columns : %zu\n"
 		    "  (-s) size of DATA                 : 1 << %zu\n"
 		    "  (-S) sweep parameters             : %s \n"
 		    "  (-v) verbose                      : %s \n\n",
-		    opts->rto_ashift,				/* -a */
-		    ilog2(opts->rto_offset),			/* -o */
-		    opts->rto_expand ? "yes" : "no",		/* -e */
-		    (u_longlong_t)opts->rto_expand_offset,	/* -r */
-		    opts->rto_dcols,				/* -d */
-		    ilog2(opts->rto_dsize),			/* -s */
-		    opts->rto_sweep ? "yes" : "no",		/* -S */
-		    verbose);					/* -v */
+		    opts->rto_ashift,			/* -a */
+		    ilog2(opts->rto_offset),		/* -o */
+		    opts->rto_dcols,			/* -d */
+		    ilog2(opts->rto_dsize),		/* -s */
+		    opts->rto_sweep ? "yes" : "no",	/* -S */
+		    verbose);				/* -v */
 	}
 }
 
@@ -119,9 +104,7 @@ static void usage(boolean_t requested)
 	    "\t[-S parameter sweep (default: %s)]\n"
 	    "\t[-t timeout for parameter sweep test]\n"
 	    "\t[-B benchmark all raidz implementations]\n"
-	    "\t[-e use expanded raidz map (default: %s)]\n"
-	    "\t[-r expanded raidz map reflow offset (default: %llx)]\n"
-	    "\t[-v increase verbosity (default: %d)]\n"
+	    "\t[-v increase verbosity (default: %zu)]\n"
 	    "\t[-h (print help)]\n"
 	    "\t[-T test the test, see if failure would be detected]\n"
 	    "\t[-D debug (attach gdb on SIGSEGV)]\n"
@@ -131,9 +114,7 @@ static void usage(boolean_t requested)
 	    o->rto_dcols,				/* -d */
 	    ilog2(o->rto_dsize),			/* -s */
 	    rto_opts.rto_sweep ? "yes" : "no",		/* -S */
-	    rto_opts.rto_expand ? "yes" : "no",		/* -e */
-	    (u_longlong_t)o->rto_expand_offset,		/* -r */
-	    o->rto_v);					/* -v */
+	    o->rto_v);					/* -d */
 
 	exit(requested ? 0 : 1);
 }
@@ -142,22 +123,19 @@ static void process_options(int argc, char **argv)
 {
 	size_t value;
 	int opt;
+
 	raidz_test_opts_t *o = &rto_opts;
 
-	memcpy(o, &rto_opts_defaults, sizeof (*o));
+	bcopy(&rto_opts_defaults, o, sizeof (*o));
+
+	while ((opt = getopt(argc, argv, "TDBSvha:o:d:s:t:")) != -1) {
+		value = 0;
 
-	while ((opt = getopt(argc, argv, "TDBSvha:er:o:d:s:t:")) != -1) {
 		switch (opt) {
 		case 'a':
 			value = strtoull(optarg, NULL, 0);
 			o->rto_ashift = MIN(13, MAX(9, value));
 			break;
-		case 'e':
-			o->rto_expand = 1;
-			break;
-		case 'r':
-			o->rto_expand_offset = strtoull(optarg, NULL, 0);
-			break;
 		case 'o':
 			value = strtoull(optarg, NULL, 0);
 			o->rto_offset = ((1ULL << MIN(12, value)) >> 9) << 9;
@@ -201,34 +179,25 @@ static void process_options(int argc, char **argv)
 	}
 }
 
-#define	DATA_COL(rr, i) ((rr)->rr_col[rr->rr_firstdatacol + (i)].rc_abd)
-#define	DATA_COL_SIZE(rr, i) ((rr)->rr_col[rr->rr_firstdatacol + (i)].rc_size)
+#define	DATA_COL(rm, i) ((rm)->rm_col[raidz_parity(rm) + (i)].rc_abd)
+#define	DATA_COL_SIZE(rm, i) ((rm)->rm_col[raidz_parity(rm) + (i)].rc_size)
 
-#define	CODE_COL(rr, i) ((rr)->rr_col[(i)].rc_abd)
-#define	CODE_COL_SIZE(rr, i) ((rr)->rr_col[(i)].rc_size)
+#define	CODE_COL(rm, i) ((rm)->rm_col[(i)].rc_abd)
+#define	CODE_COL_SIZE(rm, i) ((rm)->rm_col[(i)].rc_size)
 
 static int
 cmp_code(raidz_test_opts_t *opts, const raidz_map_t *rm, const int parity)
 {
-	int r, i, ret = 0;
+	int i, ret = 0;
 
 	VERIFY(parity >= 1 && parity <= 3);
 
-	for (r = 0; r < rm->rm_nrows; r++) {
-		raidz_row_t * const rr = rm->rm_row[r];
-		raidz_row_t * const rrg = opts->rm_golden->rm_row[r];
-		for (i = 0; i < parity; i++) {
-			if (CODE_COL_SIZE(rrg, i) == 0) {
-				VERIFY0(CODE_COL_SIZE(rr, i));
-				continue;
-			}
-
-			if (abd_cmp(CODE_COL(rr, i),
-			    CODE_COL(rrg, i)) != 0) {
-				ret++;
-				LOG_OPT(D_DEBUG, opts,
-				    "\nParity block [%d] different!\n", i);
-			}
+	for (i = 0; i < parity; i++) {
+		if (abd_cmp(CODE_COL(rm, i), CODE_COL(opts->rm_golden, i))
+		    != 0) {
+			ret++;
+			LOG_OPT(D_DEBUG, opts,
+			    "\nParity block [%d] different!\n", i);
 		}
 	}
 	return (ret);
@@ -237,26 +206,16 @@ cmp_code(raidz_test_opts_t *opts, const raidz_map_t *rm, const int parity)
 static int
 cmp_data(raidz_test_opts_t *opts, raidz_map_t *rm)
 {
-	int r, i, dcols, ret = 0;
+	int i, ret = 0;
+	int dcols = opts->rm_golden->rm_cols - raidz_parity(opts->rm_golden);
 
-	for (r = 0; r < rm->rm_nrows; r++) {
-		raidz_row_t *rr = rm->rm_row[r];
-		raidz_row_t *rrg = opts->rm_golden->rm_row[r];
-		dcols = opts->rm_golden->rm_row[0]->rr_cols -
-		    raidz_parity(opts->rm_golden);
-		for (i = 0; i < dcols; i++) {
-			if (DATA_COL_SIZE(rrg, i) == 0) {
-				VERIFY0(DATA_COL_SIZE(rr, i));
-				continue;
-			}
+	for (i = 0; i < dcols; i++) {
+		if (abd_cmp(DATA_COL(opts->rm_golden, i), DATA_COL(rm, i))
+		    != 0) {
+			ret++;
 
-			if (abd_cmp(DATA_COL(rrg, i),
-			    DATA_COL(rr, i)) != 0) {
-				ret++;
-
-				LOG_OPT(D_DEBUG, opts,
-				    "\nData block [%d] different!\n", i);
-			}
+			LOG_OPT(D_DEBUG, opts,
+			    "\nData block [%d] different!\n", i);
 		}
 	}
 	return (ret);
@@ -265,21 +224,24 @@ cmp_data(raidz_test_opts_t *opts, raidz_map_t *rm)
 static int
 init_rand(void *data, size_t size, void *private)
 {
-	(void) private;
-	memcpy(data, rand_data, size);
+	int i;
+	int *dst = (int *)data;
+
+	for (i = 0; i < size / sizeof (int); i++)
+		dst[i] = rand_data[i];
+
 	return (0);
 }
 
 static void
 corrupt_colums(raidz_map_t *rm, const int *tgts, const int cnt)
 {
-	for (int r = 0; r < rm->rm_nrows; r++) {
-		raidz_row_t *rr = rm->rm_row[r];
-		for (int i = 0; i < cnt; i++) {
-			raidz_col_t *col = &rr->rr_col[tgts[i]];
-			abd_iterate_func(col->rc_abd, 0, col->rc_size,
-			    init_rand, NULL);
-		}
+	int i;
+	raidz_col_t *col;
+
+	for (i = 0; i < cnt; i++) {
+		col = &rm->rm_col[tgts[i]];
+		abd_iterate_func(col->rc_abd, 0, col->rc_size, init_rand, NULL);
 	}
 }
 
@@ -326,20 +288,10 @@ init_raidz_golden_map(raidz_test_opts_t *opts, const int parity)
 
 	VERIFY0(vdev_raidz_impl_set("original"));
 
-	if (opts->rto_expand) {
-		opts->rm_golden =
-		    vdev_raidz_map_alloc_expanded(opts->zio_golden,
-		    opts->rto_ashift, total_ncols+1, total_ncols,
-		    parity, opts->rto_expand_offset, 0, B_FALSE);
-		rm_test = vdev_raidz_map_alloc_expanded(zio_test,
-		    opts->rto_ashift, total_ncols+1, total_ncols,
-		    parity, opts->rto_expand_offset, 0, B_FALSE);
-	} else {
-		opts->rm_golden = vdev_raidz_map_alloc(opts->zio_golden,
-		    opts->rto_ashift, total_ncols, parity);
-		rm_test = vdev_raidz_map_alloc(zio_test,
-		    opts->rto_ashift, total_ncols, parity);
-	}
+	opts->rm_golden = vdev_raidz_map_alloc(opts->zio_golden,
+	    opts->rto_ashift, total_ncols, parity);
+	rm_test = vdev_raidz_map_alloc(zio_test,
+	    opts->rto_ashift, total_ncols, parity);
 
 	VERIFY(opts->zio_golden);
 	VERIFY(opts->rm_golden);
@@ -378,14 +330,8 @@ init_raidz_map(raidz_test_opts_t *opts, zio_t **zio, const int parity)
 	(*zio)->io_abd = raidz_alloc(alloc_dsize);
 	init_zio_abd(*zio);
 
-	if (opts->rto_expand) {
-		rm = vdev_raidz_map_alloc_expanded(*zio,
-		    opts->rto_ashift, total_ncols+1, total_ncols,
-		    parity, opts->rto_expand_offset, 0, B_FALSE);
-	} else {
-		rm = vdev_raidz_map_alloc(*zio, opts->rto_ashift,
-		    total_ncols, parity);
-	}
+	rm = vdev_raidz_map_alloc(*zio, opts->rto_ashift,
+	    total_ncols, parity);
 	VERIFY(rm);
 
 	/* Make sure code columns are destroyed */
@@ -474,7 +420,7 @@ run_rec_check_impl(raidz_test_opts_t *opts, raidz_map_t *rm, const int fn)
 	if (fn < RAIDZ_REC_PQ) {
 		/* can reconstruct 1 failed data disk */
 		for (x0 = 0; x0 < opts->rto_dcols; x0++) {
-			if (x0 >= rm->rm_row[0]->rr_cols - raidz_parity(rm))
+			if (x0 >= rm->rm_cols - raidz_parity(rm))
 				continue;
 
 			/* Check if should stop */
@@ -499,11 +445,10 @@ run_rec_check_impl(raidz_test_opts_t *opts, raidz_map_t *rm, const int fn)
 	} else if (fn < RAIDZ_REC_PQR) {
 		/* can reconstruct 2 failed data disk */
 		for (x0 = 0; x0 < opts->rto_dcols; x0++) {
-			if (x0 >= rm->rm_row[0]->rr_cols - raidz_parity(rm))
+			if (x0 >= rm->rm_cols - raidz_parity(rm))
 				continue;
 			for (x1 = x0 + 1; x1 < opts->rto_dcols; x1++) {
-				if (x1 >= rm->rm_row[0]->rr_cols -
-				    raidz_parity(rm))
+				if (x1 >= rm->rm_cols - raidz_parity(rm))
 					continue;
 
 				/* Check if should stop */
@@ -530,15 +475,14 @@ run_rec_check_impl(raidz_test_opts_t *opts, raidz_map_t *rm, const int fn)
 	} else {
 		/* can reconstruct 3 failed data disk */
 		for (x0 = 0; x0 < opts->rto_dcols; x0++) {
-			if (x0 >= rm->rm_row[0]->rr_cols - raidz_parity(rm))
+			if (x0 >= rm->rm_cols - raidz_parity(rm))
 				continue;
 			for (x1 = x0 + 1; x1 < opts->rto_dcols; x1++) {
-				if (x1 >= rm->rm_row[0]->rr_cols -
-				    raidz_parity(rm))
+				if (x1 >= rm->rm_cols - raidz_parity(rm))
 					continue;
 				for (x2 = x1 + 1; x2 < opts->rto_dcols; x2++) {
-					if (x2 >= rm->rm_row[0]->rr_cols -
-					    raidz_parity(rm))
+					if (x2 >=
+					    rm->rm_cols - raidz_parity(rm))
 						continue;
 
 					/* Check if should stop */
@@ -654,7 +598,7 @@ static kcondvar_t sem_cv;
 static int max_free_slots;
 static int free_slots;
 
-static __attribute__((noreturn)) void
+static void
 sweep_thread(void *arg)
 {
 	int err = 0;
@@ -754,10 +698,8 @@ run_sweep(void)
 		opts = umem_zalloc(sizeof (raidz_test_opts_t), UMEM_NOFAIL);
 		opts->rto_ashift = ashift_v[a];
 		opts->rto_dcols = dcols_v[d];
-		opts->rto_offset = (1ULL << ashift_v[a]) * rand();
+		opts->rto_offset = (1 << ashift_v[a]) * rand();
 		opts->rto_dsize = size_v[s];
-		opts->rto_expand = rto_opts.rto_expand;
-		opts->rto_expand_offset = rto_opts.rto_expand_offset;
 		opts->rto_v = 0; /* be quiet */
 
 		VERIFY3P(thread_create(NULL, 0, sweep_thread, (void *) opts,
@@ -790,7 +732,6 @@ exit:
 	return (sweep_state == SWEEP_ERROR ? SWEEP_ERROR : 0);
 }
 
-
 int
 main(int argc, char **argv)
 {
@@ -798,8 +739,8 @@ main(int argc, char **argv)
 	struct sigaction action;
 	int err = 0;
 
-	/* init gdb pid string early */
-	(void) sprintf(pid_s, "%d", getpid());
+	/* init gdb string early */
+	(void) sprintf(gdb, gdb_tmpl, getpid());
 
 	action.sa_handler = sig_handler;
 	sigemptyset(&action.sa_mask);
@@ -816,7 +757,7 @@ main(int argc, char **argv)
 
 	process_options(argc, argv);
 
-	kernel_init(SPA_MODE_READ);
+	kernel_init(FREAD);
 
 	/* setup random data because rand() is not reentrant */
 	rand_data = (int *)umem_alloc(SPA_MAXBLOCKSIZE, UMEM_NOFAIL);

cmd/raidz_test/raidz_test.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -7,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 https://opensource.org/licenses/CDDL-1.0.
+ * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
@@ -29,7 +28,7 @@
 
 #include <sys/spa.h>
 
-static const char *const raidz_impl_names[] = {
+static const char *raidz_impl_names[] = {
 	"original",
 	"scalar",
 	"sse2",
@@ -39,27 +38,18 @@ static const char *const raidz_impl_names[] = {
 	"avx512bw",
 	"aarch64_neon",
 	"aarch64_neonx2",
-	"powerpc_altivec",
 	NULL
 };
 
-enum raidz_verbosity {
-	D_ALL,
-	D_INFO,
-	D_DEBUG,
-};
-
 typedef struct raidz_test_opts {
 	size_t rto_ashift;
-	uint64_t rto_offset;
+	size_t rto_offset;
 	size_t rto_dcols;
 	size_t rto_dsize;
-	enum raidz_verbosity rto_v;
+	size_t rto_v;
 	size_t rto_sweep;
 	size_t rto_sweep_timeout;
 	size_t rto_benchmark;
-	size_t rto_expand;
-	uint64_t rto_expand_offset;
 	size_t rto_sanity;
 	size_t rto_gdb;
 
@@ -75,11 +65,9 @@ static const raidz_test_opts_t rto_opts_defaults = {
 	.rto_offset = 1ULL << 0,
 	.rto_dcols = 8,
 	.rto_dsize = 1<<19,
-	.rto_v = D_ALL,
+	.rto_v = 0,
 	.rto_sweep = 0,
 	.rto_benchmark = 0,
-	.rto_expand = 0,
-	.rto_expand_offset = -1ULL,
 	.rto_sanity = 0,
 	.rto_gdb = 0,
 	.rto_should_stop = B_FALSE
@@ -93,19 +81,23 @@ static inline size_t ilog2(size_t a)
 }
 
 
-#define	LOG(lvl, ...)				\
+#define	D_ALL	0
+#define	D_INFO	1
+#define	D_DEBUG	2
+
+#define	LOG(lvl, a...)				\
 {						\
 	if (rto_opts.rto_v >= lvl)		\
-		(void) fprintf(stdout, __VA_ARGS__);	\
+		(void) fprintf(stdout, a);	\
 }						\
 
-#define	LOG_OPT(lvl, opt, ...)			\
+#define	LOG_OPT(lvl, opt, a...)			\
 {						\
 	if (opt->rto_v >= lvl)			\
-		(void) fprintf(stdout, __VA_ARGS__);	\
+		(void) fprintf(stdout, a);	\
 }						\
 
-#define	ERR(...)	(void) fprintf(stderr, __VA_ARGS__)
+#define	ERR(a...)	(void) fprintf(stderr, a)
 
 
 #define	DBLSEP "================\n"

cmd/vdev_id/Makefile.am

@@ -0,0 +1 @@
+dist_udev_SCRIPTS = vdev_id

cmd/vdev_id/vdev_id

@@ -79,34 +79,6 @@
 # channel 86:00.0 1         A
 # channel 86:00.0 0         B
 
-# #
-# # Example vdev_id.conf - multipath / multijbod-daisychaining
-# #
-#
-# multipath yes
-# multijbod yes
-#
-# #       PCI_ID  HBA PORT  CHANNEL NAME
-# channel 85:00.0 1         A
-# channel 85:00.0 0         B
-# channel 86:00.0 1         A
-# channel 86:00.0 0         B
-
-# #
-# # Example vdev_id.conf - multipath / mixed
-# #
-#
-# multipath yes
-# slot mix
-#
-# #       PCI_ID  HBA PORT  CHANNEL NAME
-# channel 85:00.0 3         A
-# channel 85:00.0 2         B
-# channel 86:00.0 3         A
-# channel 86:00.0 2         B
-# channel af:00.0 0         C
-# channel af:00.0 1         C
-
 # #
 # # Example vdev_id.conf - alias
 # #
@@ -120,11 +92,9 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin
 CONFIG=/etc/zfs/vdev_id.conf
 PHYS_PER_PORT=
 DEV=
+MULTIPATH=
 TOPOLOGY=
 BAY=
-ENCL_ID=""
-UNIQ_ENCL_ID=""
-ZPAD=1
 
 usage() {
 	cat << EOF
@@ -132,153 +102,71 @@ Usage: vdev_id [-h]
        vdev_id <-d device> [-c config_file] [-p phys_per_port]
                [-g sas_direct|sas_switch|scsi] [-m]
 
-  -c    specify name of an alternative config file [default=$CONFIG]
+  -c    specify name of alernate config file [default=$CONFIG]
   -d    specify basename of device (i.e. sda)
   -e    Create enclose device symlinks only (/dev/by-enclosure)
   -g    Storage network topology [default="$TOPOLOGY"]
   -m    Run in multipath mode
-  -j    Run in multijbod mode
   -p    number of phy's per switch port [default=$PHYS_PER_PORT]
   -h    show this summary
 EOF
-	exit 1
-	# exit with error to avoid processing usage message by a udev rule
+	exit 0
 }
 
 map_slot() {
-	LINUX_SLOT=$1
-	CHANNEL=$2
+	local LINUX_SLOT=$1
+	local CHANNEL=$2
+	local MAPPED_SLOT=
 
-	MAPPED_SLOT=$(awk -v linux_slot="$LINUX_SLOT" -v channel="$CHANNEL" \
-			'$1 == "slot" && $2 == linux_slot && \
-			($4 ~ "^"channel"$" || $4 ~ /^$/) { print $3; exit}' $CONFIG)
+	MAPPED_SLOT=`awk "\\$1 == \"slot\" && \\$2 == ${LINUX_SLOT} && \
+			\\$4 ~ /^${CHANNEL}$|^$/ { print \\$3; exit }" $CONFIG`
 	if [ -z "$MAPPED_SLOT" ] ; then
 		MAPPED_SLOT=$LINUX_SLOT
 	fi
-	printf "%0${ZPAD}d" "${MAPPED_SLOT}"
+	printf "%d" ${MAPPED_SLOT}
 }
 
 map_channel() {
-	MAPPED_CHAN=
-	PCI_ID=$1
-	PORT=$2
+	local MAPPED_CHAN=
+	local PCI_ID=$1
+	local PORT=$2
 
 	case $TOPOLOGY in
 		"sas_switch")
-		MAPPED_CHAN=$(awk -v port="$PORT" \
-			'$1 == "channel" && $2 == port \
-			{ print $3; exit }' $CONFIG)
+		MAPPED_CHAN=`awk "\\$1 == \"channel\" && \\$2 == ${PORT} \
+			{ print \\$3; exit }" $CONFIG`
 		;;
 		"sas_direct"|"scsi")
-		MAPPED_CHAN=$(awk -v pciID="$PCI_ID" -v port="$PORT" \
-			'$1 == "channel" && $2 == pciID && $3 == port \
-			{print $4}' $CONFIG)
+		MAPPED_CHAN=`awk "\\$1 == \"channel\" && \
+			\\$2 == \"${PCI_ID}\" && \\$3 == ${PORT} \
+			{ print \\$4; exit }" $CONFIG`
 		;;
 	esac
-	printf "%s" "${MAPPED_CHAN}"
-}
-
-get_encl_id() {
-	set -- $(echo $1)
-	count=$#
-
-	i=1
-	while [ $i -le $count ] ; do
-		d=$(eval echo '$'{$i})
-		id=$(cat "/sys/class/enclosure/${d}/id")
-		ENCL_ID="${ENCL_ID} $id"
-		i=$((i + 1))
-	done
-}
-
-get_uniq_encl_id() {
-	for uuid in ${ENCL_ID}; do
-		found=0
-
-		for count in ${UNIQ_ENCL_ID}; do
-			if [ $count = $uuid ]; then
-				found=1
-				break
-			fi
-		done
-
-		if [ $found -eq 0 ]; then
-			UNIQ_ENCL_ID="${UNIQ_ENCL_ID} $uuid"
-		fi
-	done
-}
-
-# map_jbod explainer: The bsg driver knows the difference between a SAS
-# expander and fanout expander. Use hostX instance along with top-level
-# (whole enclosure) expander instances in /sys/class/enclosure and
-# matching a field in an array of expanders, using the index of the
-# matched array field as the enclosure instance, thereby making jbod IDs
-# dynamic. Avoids reliance on high overhead userspace commands like
-# multipath and lsscsi and instead uses existing sysfs data.  $HOSTCHAN
-# variable derived from devpath gymnastics in sas_handler() function.
-map_jbod() {
-	DEVEXP=$(ls -l "/sys/block/$DEV/device/" | grep enclos | awk -F/ '{print $(NF-1) }')
-	DEV=$1
-
-	# Use "set --" to create index values (Arrays)
-	set -- $(ls -l /sys/class/enclosure | grep -v "^total" | awk '{print $9}')
-	# Get count of total elements
-	JBOD_COUNT=$#
-	JBOD_ITEM=$*
-
-	# Build JBODs (enclosure)  id from sys/class/enclosure/<dev>/id
-	get_encl_id "$JBOD_ITEM"
-	# Different expander instances for each paths.
-	# Filter out and keep only unique id.
-	get_uniq_encl_id
-
-	# Identify final 'mapped jbod'
-	j=0
-	for count in ${UNIQ_ENCL_ID}; do
-		i=1
-		j=$((j + 1))
-		while [ $i -le $JBOD_COUNT ] ; do
-			d=$(eval echo '$'{$i})
-			id=$(cat "/sys/class/enclosure/${d}/id")
-			if [ "$d" = "$DEVEXP" ] && [ $id = $count ] ; then
-				MAPPED_JBOD=$j
-				break
-			fi
-			i=$((i + 1))
-		done
-	done
-
-	printf "%d" "${MAPPED_JBOD}"
+	printf "%s" ${MAPPED_CHAN}
 }
 
 sas_handler() {
 	if [ -z "$PHYS_PER_PORT" ] ; then
-		PHYS_PER_PORT=$(awk '$1 == "phys_per_port" \
-			{print $2; exit}' $CONFIG)
+		PHYS_PER_PORT=`awk "\\$1 == \"phys_per_port\" \
+			{print \\$2; exit}" $CONFIG`
 	fi
 	PHYS_PER_PORT=${PHYS_PER_PORT:-4}
-
-	if ! echo "$PHYS_PER_PORT" | grep -q -E '^[0-9]+$' ; then
+	if ! echo $PHYS_PER_PORT | grep -q -E '^[0-9]+$' ; then
 		echo "Error: phys_per_port value $PHYS_PER_PORT is non-numeric"
 		exit 1
 	fi
 
 	if [ -z "$MULTIPATH_MODE" ] ; then
-		MULTIPATH_MODE=$(awk '$1 == "multipath" \
-			{print $2; exit}' $CONFIG)
-	fi
-
-	if [ -z "$MULTIJBOD_MODE" ] ; then
-		MULTIJBOD_MODE=$(awk '$1 == "multijbod" \
-			{print $2; exit}' $CONFIG)
+		MULTIPATH_MODE=`awk "\\$1 == \"multipath\" \
+			{print \\$2; exit}" $CONFIG`
 	fi
 
 	# Use first running component device if we're handling a dm-mpath device
 	if [ "$MULTIPATH_MODE" = "yes" ] ; then
 		# If udev didn't tell us the UUID via DM_NAME, check /dev/mapper
 		if [ -z "$DM_NAME" ] ; then
-			DM_NAME=$(ls -l --full-time /dev/mapper |
-				grep "$DEV"$ | awk '{print $9}')
+			DM_NAME=`ls -l --full-time /dev/mapper |
+				awk "/\/$DEV$/{print \\$9}"`
 		fi
 
 		# For raw disks udev exports DEVTYPE=partition when
@@ -288,50 +176,28 @@ sas_handler() {
 		# we have to append the -part suffix directly in the
 		# helper.
 		if [ "$DEVTYPE" != "partition" ] ; then
-			# Match p[number], remove the 'p' and prepend "-part"
-			PART=$(echo "$DM_NAME" |
-				awk 'match($0,/p[0-9]+$/) {print "-part"substr($0,RSTART+1,RLENGTH-1)}')
+			PART=`echo $DM_NAME | awk -Fp '/p/{print "-part"$2}'`
 		fi
 
 		# Strip off partition information.
-		DM_NAME=$(echo "$DM_NAME" | sed 's/p[0-9][0-9]*$//')
+		DM_NAME=`echo $DM_NAME | sed 's/p[0-9][0-9]*$//'`
 		if [ -z "$DM_NAME" ] ; then
 			return
 		fi
 
-		# Utilize DM device name to gather subordinate block devices
-		# using sysfs to avoid userspace utilities
-
-		# If our DEVNAME is something like /dev/dm-177, then we may be
-		# able to get our DMDEV from it.
-		DMDEV=$(echo $DEVNAME | sed 's;/dev/;;g')
-		if [ ! -e /sys/block/$DMDEV/slaves/* ] ; then
-			# It's not there, try looking in /dev/mapper
-			DMDEV=$(ls -l --full-time /dev/mapper | grep $DM_NAME |
-			awk '{gsub("../", " "); print $NF}')
-		fi
-
-		# Use sysfs pointers in /sys/block/dm-X/slaves because using
-		# userspace tools creates lots of overhead and should be avoided
-		# whenever possible. Use awk to isolate lowest instance of
-		# sd device member in dm device group regardless of string
-		# length.
-		DEV=$(ls "/sys/block/$DMDEV/slaves" | awk '
-			{ len=sprintf ("%20s",length($0)); gsub(/ /,0,str); a[NR]=len "_" $0; }
-			END {
-				asort(a)
-				print substr(a[1],22)
-			}')
-
+		# Get the raw scsi device name from multipath -ll. Strip off
+		# leading pipe symbols to make field numbering consistent.
+		DEV=`multipath -ll $DM_NAME |
+			awk '/running/{gsub("^[|]"," "); print $3 ; exit}'`
 		if [ -z "$DEV" ] ; then
 			return
 		fi
 	fi
 
-	if echo "$DEV" | grep -q ^/devices/ ; then
+	if echo $DEV | grep -q ^/devices/ ; then
 		sys_path=$DEV
 	else
-		sys_path=$(udevadm info -q path -p "/sys/block/$DEV" 2>/dev/null)
+		sys_path=`udevadm info -q path -p /sys/block/$DEV 2>/dev/null`
 	fi
 
 	# Use positional parameters as an ad-hoc array
@@ -341,113 +207,84 @@ sas_handler() {
 
 	# Get path up to /sys/.../hostX
 	i=1
-
-	while [ $i -le "$num_dirs" ] ; do
-		d=$(eval echo '$'{$i})
+	while [ $i -le $num_dirs ] ; do
+		d=$(eval echo \${$i})
 		scsi_host_dir="$scsi_host_dir/$d"
-		echo "$d" | grep -q -E '^host[0-9]+$' && break
-		i=$((i + 1))
+		echo $d | grep -q -E '^host[0-9]+$' && break
+		i=$(($i + 1))
 	done
 
-	# Lets grab the SAS host channel number and save it for JBOD sorting later
-	HOSTCHAN=$(echo "$d" | awk -F/ '{ gsub("host","",$NF); print $NF}')
-
-	if [ $i = "$num_dirs" ] ; then
+	if [ $i = $num_dirs ] ; then
 		return
 	fi
 
-	PCI_ID=$(eval echo '$'{$((i -1))} | awk -F: '{print $2":"$3}')
+	PCI_ID=$(eval echo \${$(($i -1))} | awk -F: '{print $2":"$3}')
 
 	# In sas_switch mode, the directory four levels beneath
 	# /sys/.../hostX contains symlinks to phy devices that reveal
 	# the switch port number.  In sas_direct mode, the phy links one
 	# directory down reveal the HBA port.
 	port_dir=$scsi_host_dir
-
 	case $TOPOLOGY in
-		"sas_switch") j=$((i + 4)) ;;
-		"sas_direct") j=$((i + 1)) ;;
+		"sas_switch") j=$(($i + 4)) ;;
+		"sas_direct") j=$(($i + 1)) ;;
 	esac
 
-	i=$((i + 1))
-
+	i=$(($i + 1))
 	while [ $i -le $j ] ; do
-		port_dir="$port_dir/$(eval echo '$'{$i})"
-		i=$((i + 1))
+		port_dir="$port_dir/$(eval echo \${$i})"
+		i=$(($i + 1))
 	done
 
-	PHY=$(ls -vd "$port_dir"/phy* 2>/dev/null | head -1 | awk -F: '{print $NF}')
+	PHY=`ls -d $port_dir/phy* 2>/dev/null | head -1 | awk -F: '{print $NF}'`
 	if [ -z "$PHY" ] ; then
 		PHY=0
 	fi
-	PORT=$((PHY / PHYS_PER_PORT))
+	PORT=$(( $PHY / $PHYS_PER_PORT ))
 
 	# Look in /sys/.../sas_device/end_device-X for the bay_identifier
 	# attribute.
 	end_device_dir=$port_dir
-
-	while [ $i -lt "$num_dirs" ] ; do
-		d=$(eval echo '$'{$i})
+	while [ $i -lt $num_dirs ] ; do
+		d=$(eval echo \${$i})
 		end_device_dir="$end_device_dir/$d"
-		if echo "$d" | grep -q '^end_device' ; then
+		if echo $d | grep -q '^end_device' ; then
 			end_device_dir="$end_device_dir/sas_device/$d"
 			break
 		fi
-		i=$((i + 1))
+		i=$(($i + 1))
 	done
 
-	# Add 'mix' slot type for environments where dm-multipath devices
-	# include end-devices connected via SAS expanders or direct connection
-	# to SAS HBA. A mixed connectivity environment such as pool devices
-	# contained in a SAS JBOD and spare drives or log devices directly
-	# connected in a server backplane without expanders in the I/O path.
 	SLOT=
-
 	case $BAY in
 	"bay")
-		SLOT=$(cat "$end_device_dir/bay_identifier" 2>/dev/null)
-		;;
-	"mix")
-		if [ $(cat "$end_device_dir/bay_identifier" 2>/dev/null) ] ; then
-			SLOT=$(cat "$end_device_dir/bay_identifier" 2>/dev/null)
-		else
-			SLOT=$(cat "$end_device_dir/phy_identifier" 2>/dev/null)
-		fi
+		SLOT=`cat $end_device_dir/bay_identifier 2>/dev/null`
 		;;
 	"phy")
-		SLOT=$(cat "$end_device_dir/phy_identifier" 2>/dev/null)
+		SLOT=`cat $end_device_dir/phy_identifier 2>/dev/null`
 		;;
 	"port")
-		d=$(eval echo '$'{$i})
-		SLOT=$(echo "$d" | sed -e 's/^.*://')
+		d=$(eval echo \${$i})
+		SLOT=`echo $d | sed -e 's/^.*://'`
 		;;
 	"id")
-		i=$((i + 1))
-		d=$(eval echo '$'{$i})
-		SLOT=$(echo "$d" | sed -e 's/^.*://')
+		i=$(($i + 1))
+		d=$(eval echo \${$i})
+		SLOT=`echo $d | sed -e 's/^.*://'`
 		;;
 	"lun")
-		i=$((i + 2))
-		d=$(eval echo '$'{$i})
-		SLOT=$(echo "$d" | sed -e 's/^.*://')
-		;;
-	"bay_lun")
-		# Like 'bay' but with the LUN number appened. Added for SAS 
-		# multi-actuator HDDs, where one physical drive has multiple
-		# LUNs, thus multiple logical drives share the same bay number
-		i=$((i + 2))
-		d=$(eval echo '$'{$i})
-		LUN="-lun$(echo "$d" | sed -e 's/^.*://')"
-		SLOT=$(cat "$end_device_dir/bay_identifier" 2>/dev/null)
+		i=$(($i + 2))
+		d=$(eval echo \${$i})
+		SLOT=`echo $d | sed -e 's/^.*://'`
 		;;
 	"ses")
 		# look for this SAS path in all SCSI Enclosure Services
 		# (SES) enclosures
-		sas_address=$(cat "$end_device_dir/sas_address" 2>/dev/null)
-		enclosures=$(lsscsi -g | \
-			sed -n -e '/enclosu/s/^.* \([^ ][^ ]*\) *$/\1/p')
+		sas_address=`cat $end_device_dir/sas_address 2>/dev/null`
+		enclosures=`lsscsi -g | \
+			sed -n -e '/enclosu/s/^.* \([^ ][^ ]*\) *$/\1/p'`
 		for enclosure in $enclosures; do
-			set -- $(sg_ses -p aes "$enclosure" | \
+			set -- $(sg_ses -p aes $enclosure | \
 				awk "/device slot number:/{slot=\$12} \
 					/SAS address: $sas_address/\
 					{print slot}")
@@ -462,55 +299,42 @@ sas_handler() {
 		return
 	fi
 
-	if [ "$MULTIJBOD_MODE" = "yes" ] ; then
-		CHAN=$(map_channel "$PCI_ID" "$PORT")
-		SLOT=$(map_slot "$SLOT" "$CHAN")
-		JBOD=$(map_jbod "$DEV")
-
-		if [ -z "$CHAN" ] ; then
-			return
-		fi
-		echo "${CHAN}"-"${JBOD}"-"${SLOT}${LUN}${PART}"
-	else
-		CHAN=$(map_channel "$PCI_ID" "$PORT")
-		SLOT=$(map_slot "$SLOT" "$CHAN")
-
-		if [ -z "$CHAN" ] ; then
-			return
-		fi
-		echo "${CHAN}${SLOT}${LUN}${PART}"
+	CHAN=`map_channel $PCI_ID $PORT`
+	SLOT=`map_slot $SLOT $CHAN`
+	if [ -z "$CHAN" ] ; then
+		return
 	fi
+	echo ${CHAN}${SLOT}${PART}
 }
 
 scsi_handler() {
 	if [ -z "$FIRST_BAY_NUMBER" ] ; then
-		FIRST_BAY_NUMBER=$(awk '$1 == "first_bay_number" \
-			{print $2; exit}' $CONFIG)
+		FIRST_BAY_NUMBER=`awk "\\$1 == \"first_bay_number\" \
+			{print \\$2; exit}" $CONFIG`
 	fi
 	FIRST_BAY_NUMBER=${FIRST_BAY_NUMBER:-0}
 
 	if [ -z "$PHYS_PER_PORT" ] ; then
-		PHYS_PER_PORT=$(awk '$1 == "phys_per_port" \
-			{print $2; exit}' $CONFIG)
+		PHYS_PER_PORT=`awk "\\$1 == \"phys_per_port\" \
+			{print \\$2; exit}" $CONFIG`
 	fi
 	PHYS_PER_PORT=${PHYS_PER_PORT:-4}
-
-	if ! echo "$PHYS_PER_PORT" | grep -q -E '^[0-9]+$' ; then
+	if ! echo $PHYS_PER_PORT | grep -q -E '^[0-9]+$' ; then
 		echo "Error: phys_per_port value $PHYS_PER_PORT is non-numeric"
 		exit 1
 	fi
 
 	if [ -z "$MULTIPATH_MODE" ] ; then
-		MULTIPATH_MODE=$(awk '$1 == "multipath" \
-			{print $2; exit}' $CONFIG)
+		MULTIPATH_MODE=`awk "\\$1 == \"multipath\" \
+			{print \\$2; exit}" $CONFIG`
 	fi
 
 	# Use first running component device if we're handling a dm-mpath device
 	if [ "$MULTIPATH_MODE" = "yes" ] ; then
 		# If udev didn't tell us the UUID via DM_NAME, check /dev/mapper
 		if [ -z "$DM_NAME" ] ; then
-			DM_NAME=$(ls -l --full-time /dev/mapper |
-				grep "$DEV"$ | awk '{print $9}')
+			DM_NAME=`ls -l --full-time /dev/mapper |
+				awk "/\/$DEV$/{print \\$9}"`
 		fi
 
 		# For raw disks udev exports DEVTYPE=partition when
@@ -520,30 +344,28 @@ scsi_handler() {
 		# we have to append the -part suffix directly in the
 		# helper.
 		if [ "$DEVTYPE" != "partition" ] ; then
-			# Match p[number], remove the 'p' and prepend "-part"
-			PART=$(echo "$DM_NAME" |
-			    awk 'match($0,/p[0-9]+$/) {print "-part"substr($0,RSTART+1,RLENGTH-1)}')
+			PART=`echo $DM_NAME | awk -Fp '/p/{print "-part"$2}'`
 		fi
 
 		# Strip off partition information.
-		DM_NAME=$(echo "$DM_NAME" | sed 's/p[0-9][0-9]*$//')
+		DM_NAME=`echo $DM_NAME | sed 's/p[0-9][0-9]*$//'`
 		if [ -z "$DM_NAME" ] ; then
 			return
 		fi
 
 		# Get the raw scsi device name from multipath -ll. Strip off
 		# leading pipe symbols to make field numbering consistent.
-		DEV=$(multipath -ll "$DM_NAME" |
-			awk '/running/{gsub("^[|]"," "); print $3 ; exit}')
+		DEV=`multipath -ll $DM_NAME |
+			awk '/running/{gsub("^[|]"," "); print $3 ; exit}'`
 		if [ -z "$DEV" ] ; then
 			return
 		fi
 	fi
 
-	if echo "$DEV" | grep -q ^/devices/ ; then
+	if echo $DEV | grep -q ^/devices/ ; then
 		sys_path=$DEV
 	else
-		sys_path=$(udevadm info -q path -p "/sys/block/$DEV" 2>/dev/null)
+		sys_path=`udevadm info -q path -p /sys/block/$DEV 2>/dev/null`
 	fi
 
 	# expect sys_path like this, for example:
@@ -556,47 +378,44 @@ scsi_handler() {
 
 	# Get path up to /sys/.../hostX
 	i=1
-
-	while [ $i -le "$num_dirs" ] ; do
-		d=$(eval echo '$'{$i})
+	while [ $i -le $num_dirs ] ; do
+		d=$(eval echo \${$i})
 		scsi_host_dir="$scsi_host_dir/$d"
-
-		echo "$d" | grep -q -E '^host[0-9]+$' && break
-		i=$((i + 1))
+		echo $d | grep -q -E '^host[0-9]+$' && break
+		i=$(($i + 1))
 	done
 
-	if [ $i = "$num_dirs" ] ; then
+	if [ $i = $num_dirs ] ; then
 		return
 	fi
 
-	PCI_ID=$(eval echo '$'{$((i -1))} | awk -F: '{print $2":"$3}')
+	PCI_ID=$(eval echo \${$(($i -1))} | awk -F: '{print $2":"$3}')
 
 	# In scsi mode, the directory two levels beneath
 	# /sys/.../hostX reveals the port and slot.
 	port_dir=$scsi_host_dir
-	j=$((i + 2))
+	j=$(($i + 2))
 
-	i=$((i + 1))
+	i=$(($i + 1))
 	while [ $i -le $j ] ; do
-		port_dir="$port_dir/$(eval echo '$'{$i})"
-		i=$((i + 1))
+		port_dir="$port_dir/$(eval echo \${$i})"
+		i=$(($i + 1))
 	done
 
-	set -- $(echo "$port_dir" | sed -e 's/^.*:\([^:]*\):\([^:]*\)$/\1 \2/')
+	set -- $(echo $port_dir | sed -e 's/^.*:\([^:]*\):\([^:]*\)$/\1 \2/')
 	PORT=$1
-	SLOT=$(($2 + FIRST_BAY_NUMBER))
+	SLOT=$(($2 + $FIRST_BAY_NUMBER))
 
 	if [ -z "$SLOT" ] ; then
 		return
 	fi
 
-	CHAN=$(map_channel "$PCI_ID" "$PORT")
-	SLOT=$(map_slot "$SLOT" "$CHAN")
-
+	CHAN=`map_channel $PCI_ID $PORT`
+	SLOT=`map_slot $SLOT $CHAN`
 	if [ -z "$CHAN" ] ; then
 		return
 	fi
-	echo "${CHAN}${SLOT}${PART}"
+	echo ${CHAN}${SLOT}${PART}
 }
 
 # Figure out the name for the enclosure symlink
@@ -606,10 +425,8 @@ enclosure_handler () {
 	# DEVPATH=/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0/host0/subsystem/devices/0:0:0:0/scsi_generic/sg0
 
 	# Get the enclosure ID ("0:0:0:0")
-	ENC="${DEVPATH%/*}"
-	ENC="${ENC%/*}"
-	ENC="${ENC##*/}"
-	if [ ! -d "/sys/class/enclosure/$ENC" ] ; then
+	ENC=$(basename $(readlink -m "/sys/$DEVPATH/../.."))
+	if [ ! -d /sys/class/enclosure/$ENC ] ; then
 		# Not an enclosure, bail out
 		return
 	fi
@@ -617,26 +434,25 @@ enclosure_handler () {
 	# Get the long sysfs device path to our enclosure. Looks like:
 	# /devices/pci0000:00/0000:00:03.0/0000:05:00.0/host0/port-0:0/ ... /enclosure/0:0:0:0
 
-	ENC_DEVICE=$(readlink "/sys/class/enclosure/$ENC")
+	ENC_DEVICE=$(readlink /sys/class/enclosure/$ENC)
 
 	# Grab the full path to the hosts port dir:
 	# /devices/pci0000:00/0000:00:03.0/0000:05:00.0/host0/port-0:0
-	PORT_DIR=$(echo "$ENC_DEVICE" | grep -Eo '.+host[0-9]+/port-[0-9]+:[0-9]+')
+	PORT_DIR=$(echo $ENC_DEVICE | grep -Eo '.+host[0-9]+/port-[0-9]+:[0-9]+')
 
 	# Get the port number
-	PORT_ID=$(echo "$PORT_DIR" | grep -Eo "[0-9]+$")
+	PORT_ID=$(echo $PORT_DIR | grep -Eo "[0-9]+$")
 
 	# The PCI directory is two directories up from the port directory
 	# /sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0
-	PCI_ID_LONG="$(readlink -m "/sys/$PORT_DIR/../..")"
-	PCI_ID_LONG="${PCI_ID_LONG##*/}"
+	PCI_ID_LONG=$(basename $(readlink -m "/sys/$PORT_DIR/../.."))
 
 	# Strip down the PCI address from 0000:05:00.0 to 05:00.0
-	PCI_ID="${PCI_ID_LONG#[0-9]*:}"
+	PCI_ID=$(echo "$PCI_ID_LONG" | sed -r 's/^[0-9]+://g')
 
 	# Name our device according to vdev_id.conf (like "L0" or "U1").
 	NAME=$(awk "/channel/{if (\$1 == \"channel\" && \$2 == \"$PCI_ID\" && \
-		\$3 == \"$PORT_ID\") {print \$4\$3}}" $CONFIG)
+		\$3 == \"$PORT_ID\") {print \$4int(count[\$4])}; count[\$4]++}" $CONFIG)
 
 	echo "${NAME}"
 }
@@ -671,12 +487,10 @@ alias_handler () {
 	#          digits as partitions, causing alias creation to fail. This
 	#          ambiguity seems unavoidable, so devices using this facility
 	#          must not use such names.
-	DM_PART=
-	if echo "$DM_NAME" | grep -q -E 'p[0-9][0-9]*$' ; then
+	local DM_PART=
+	if echo $DM_NAME | grep -q -E 'p[0-9][0-9]*$' ; then
 		if [ "$DEVTYPE" != "partition" ] ; then
-			# Match p[number], remove the 'p' and prepend "-part"
-			DM_PART=$(echo "$DM_NAME" |
-			    awk 'match($0,/p[0-9]+$/) {print "-part"substr($0,RSTART+1,RLENGTH-1)}')
+			DM_PART=`echo $DM_NAME | awk -Fp '/p/{print "-part"$2}'`
 		fi
 	fi
 
@@ -684,25 +498,21 @@ alias_handler () {
 	for link in $DEVLINKS ; do
 		# Remove partition information to match key of top-level device.
 		if [ -n "$DM_PART" ] ; then
-			link=$(echo "$link" | sed 's/p[0-9][0-9]*$//')
+			link=`echo $link | sed 's/p[0-9][0-9]*$//'`
 		fi
 		# Check both the fully qualified and the base name of link.
-		for l in $link ${link##*/} ; do
-			if [ ! -z "$l" ]; then
-				alias=$(awk -v var="$l" '($1 == "alias") && \
-					($3 == var) \
-					{ print $2; exit }' $CONFIG)
-				if [ -n "$alias" ] ; then
-					echo "${alias}${DM_PART}"
-					return
-				fi
+		for l in $link `basename $link` ; do
+			alias=`awk "\\$1 == \"alias\" && \\$3 == \"${l}\" \
+					{ print \\$2; exit }" $CONFIG`
+			if [ -n "$alias" ] ; then
+				echo ${alias}${DM_PART}
+				return
 			fi
 		done
 	done
 }
 
-# main
-while getopts 'c:d:eg:jmp:h' OPTION; do
+while getopts 'c:d:eg:mp:h' OPTION; do
 	case ${OPTION} in
 	c)
 		CONFIG=${OPTARG}
@@ -715,9 +525,7 @@ while getopts 'c:d:eg:jmp:h' OPTION; do
 	# create the enclosure device symlinks only.  We also need
 	# "enclosure_symlinks yes" set in vdev_id.config to actually create the
 	# symlink.
-	ENCLOSURE_MODE=$(awk '{if ($1 == "enclosure_symlinks") \
-		print $2}' "$CONFIG")
-
+	ENCLOSURE_MODE=$(awk '{if ($1 == "enclosure_symlinks") print $2}' $CONFIG)
 	if [ "$ENCLOSURE_MODE" != "yes" ] ; then
 		exit 0
 	fi
@@ -728,9 +536,6 @@ while getopts 'c:d:eg:jmp:h' OPTION; do
 	p)
 		PHYS_PER_PORT=${OPTARG}
 		;;
-	j)
-		MULTIJBOD_MODE=yes
-		;;
 	m)
 		MULTIPATH_MODE=yes
 		;;
@@ -740,37 +545,34 @@ while getopts 'c:d:eg:jmp:h' OPTION; do
 	esac
 done
 
-if [ ! -r "$CONFIG" ] ; then
-	echo "Error: Config file \"$CONFIG\" not found"
-	exit 1
+if [ ! -r $CONFIG ] ; then
+	exit 0
 fi
 
-if [ -z "$DEV" ] && [ -z "$ENCLOSURE_MODE" ] ; then
+if [ -z "$DEV" -a -z "$ENCLOSURE_MODE" ] ; then
 	echo "Error: missing required option -d"
 	exit 1
 fi
 
 if [ -z "$TOPOLOGY" ] ; then
-	TOPOLOGY=$(awk '($1 == "topology") {print $2; exit}' "$CONFIG")
+	TOPOLOGY=`awk "\\$1 == \"topology\" {print \\$2; exit}" $CONFIG`
 fi
 
 if [ -z "$BAY" ] ; then
-	BAY=$(awk '($1 == "slot") {print $2; exit}' "$CONFIG")
+	BAY=`awk "\\$1 == \"slot\" {print \\$2; exit}" $CONFIG`
 fi
 
-ZPAD=$(awk '($1 == "zpad_slot") {print $2; exit}' "$CONFIG")
-
 TOPOLOGY=${TOPOLOGY:-sas_direct}
 
 # Should we create /dev/by-enclosure symlinks?
-if [ "$ENCLOSURE_MODE" = "yes" ] && [ "$TOPOLOGY" = "sas_direct" ] ; then
+if [ "$ENCLOSURE_MODE" = "yes" -a "$TOPOLOGY" = "sas_direct" ] ; then
 	ID_ENCLOSURE=$(enclosure_handler)
 	if [ -z "$ID_ENCLOSURE" ] ; then
 		exit 0
 	fi
 
 	# Just create the symlinks to the enclosure devices and then exit.
-	ENCLOSURE_PREFIX=$(awk '/enclosure_symlinks_prefix/{print $2}' "$CONFIG")
+	ENCLOSURE_PREFIX=$(awk '/enclosure_symlinks_prefix/{print $2}' $CONFIG)
 	if [ -z "$ENCLOSURE_PREFIX" ] ; then
 		ENCLOSURE_PREFIX="enc"
 	fi
@@ -780,16 +582,16 @@ if [ "$ENCLOSURE_MODE" = "yes" ] && [ "$TOPOLOGY" = "sas_direct" ] ; then
 fi
 
 # First check if an alias was defined for this device.
-ID_VDEV=$(alias_handler)
+ID_VDEV=`alias_handler`
 
 if [ -z "$ID_VDEV" ] ; then
 	BAY=${BAY:-bay}
 	case $TOPOLOGY in
 		sas_direct|sas_switch)
-			ID_VDEV=$(sas_handler)
+			ID_VDEV=`sas_handler`
 			;;
 		scsi)
-			ID_VDEV=$(scsi_handler)
+			ID_VDEV=`scsi_handler`
 			;;
 		*)
 			echo "Error: unknown topology $TOPOLOGY"

cmd/zdb/.gitignore

@@ -0,0 +1 @@
+/zdb

cmd/zdb/Makefile.am

@@ -1,18 +1,19 @@
-zdb_CPPFLAGS = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
-zdb_CFLAGS   = $(AM_CFLAGS) $(LIBCRYPTO_CFLAGS)
+include $(top_srcdir)/config/Rules.am
 
-sbin_PROGRAMS   += zdb
-CPPCHECKTARGETS += zdb
+# Unconditionally enable debugging for zdb
+AM_CPPFLAGS += -DDEBUG -UNDEBUG
+
+DEFAULT_INCLUDES += \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/lib/libspl/include
+
+sbin_PROGRAMS = zdb
 
 zdb_SOURCES = \
-	%D%/zdb.c \
-	%D%/zdb.h \
-	%D%/zdb_il.c
+	zdb.c \
+	zdb_il.c \
+	zdb.h
 
 zdb_LDADD = \
-	libzdb.la \
-	libzpool.la \
-	libzfs_core.la \
-	libnvpair.la
-
-zdb_LDADD += $(LIBCRYPTO_LIBS)
+	$(top_builddir)/lib/libnvpair/libnvpair.la \
+	$(top_builddir)/lib/libzpool/libzpool.la

cmd/zdb/zdb.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -7,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 https://opensource.org/licenses/CDDL-1.0.
+ * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *

cmd/zdb/zdb_il.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -7,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 https://opensource.org/licenses/CDDL-1.0.
+ * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
@@ -61,26 +60,25 @@ print_log_bp(const blkptr_t *bp, const char *prefix)
 	(void) printf("%s%s\n", prefix, blkbuf);
 }
 
+/* ARGSUSED */
 static void
-zil_prt_rec_create(zilog_t *zilog, int txtype, const void *arg)
+zil_prt_rec_create(zilog_t *zilog, int txtype, void *arg)
 {
-	(void) zilog;
-	const lr_create_t *lrc = arg;
-	const _lr_create_t *lr = &lrc->lr_create;
+	lr_create_t *lr = arg;
 	time_t crtime = lr->lr_crtime[0];
-	const char *name, *link;
+	char *name, *link;
 	lr_attr_t *lrattr;
 
-	name = (const char *)&lrc->lr_data[0];
+	name = (char *)(lr + 1);
 
 	if (lr->lr_common.lrc_txtype == TX_CREATE_ATTR ||
 	    lr->lr_common.lrc_txtype == TX_MKDIR_ATTR) {
-		lrattr = (lr_attr_t *)&lrc->lr_data[0];
+		lrattr = (lr_attr_t *)(lr + 1);
 		name += ZIL_XVAT_SIZE(lrattr->lr_attr_masksize);
 	}
 
 	if (txtype == TX_SYMLINK) {
-		link = (const char *)&lrc->lr_data[strlen(name) + 1];
+		link = name + strlen(name) + 1;
 		(void) printf("%s%s -> %s\n", tab_prefix, name, link);
 	} else if (txtype != TX_MKXATTR) {
 		(void) printf("%s%s\n", tab_prefix, name);
@@ -98,53 +96,44 @@ zil_prt_rec_create(zilog_t *zilog, int txtype, const void *arg)
 	    (u_longlong_t)lr->lr_gen, (u_longlong_t)lr->lr_rdev);
 }
 
+/* ARGSUSED */
 static void
-zil_prt_rec_remove(zilog_t *zilog, int txtype, const void *arg)
+zil_prt_rec_remove(zilog_t *zilog, int txtype, void *arg)
 {
-	(void) zilog, (void) txtype;
-	const lr_remove_t *lr = arg;
+	lr_remove_t *lr = arg;
 
 	(void) printf("%sdoid %llu, name %s\n", tab_prefix,
-	    (u_longlong_t)lr->lr_doid, (const char *)&lr->lr_data[0]);
+	    (u_longlong_t)lr->lr_doid, (char *)(lr + 1));
 }
 
+/* ARGSUSED */
 static void
-zil_prt_rec_link(zilog_t *zilog, int txtype, const void *arg)
+zil_prt_rec_link(zilog_t *zilog, int txtype, void *arg)
 {
-	(void) zilog, (void) txtype;
-	const lr_link_t *lr = arg;
+	lr_link_t *lr = arg;
 
 	(void) printf("%sdoid %llu, link_obj %llu, name %s\n", tab_prefix,
 	    (u_longlong_t)lr->lr_doid, (u_longlong_t)lr->lr_link_obj,
-	    (const char *)&lr->lr_data[0]);
+	    (char *)(lr + 1));
 }
 
+/* ARGSUSED */
 static void
-zil_prt_rec_rename(zilog_t *zilog, int txtype, const void *arg)
+zil_prt_rec_rename(zilog_t *zilog, int txtype, void *arg)
 {
-	(void) zilog, (void) txtype;
-	const lr_rename_t *lrr = arg;
-	const _lr_rename_t *lr = &lrr->lr_rename;
-	const char *snm = (const char *)&lrr->lr_data[0];
-	const char *tnm = (const char *)&lrr->lr_data[strlen(snm) + 1];
+	lr_rename_t *lr = arg;
+	char *snm = (char *)(lr + 1);
+	char *tnm = snm + strlen(snm) + 1;
 
 	(void) printf("%ssdoid %llu, tdoid %llu\n", tab_prefix,
 	    (u_longlong_t)lr->lr_sdoid, (u_longlong_t)lr->lr_tdoid);
 	(void) printf("%ssrc %s tgt %s\n", tab_prefix, snm, tnm);
-	switch (txtype) {
-	case TX_RENAME_EXCHANGE:
-		(void) printf("%sflags RENAME_EXCHANGE\n", tab_prefix);
-		break;
-	case TX_RENAME_WHITEOUT:
-		(void) printf("%sflags RENAME_WHITEOUT\n", tab_prefix);
-		break;
-	}
 }
 
+/* ARGSUSED */
 static int
 zil_prt_rec_write_cb(void *data, size_t len, void *unused)
 {
-	(void) unused;
 	char *cdata = data;
 
 	for (size_t i = 0; i < len; i++) {
@@ -157,12 +146,13 @@ zil_prt_rec_write_cb(void *data, size_t len, void *unused)
 	return (0);
 }
 
+/* ARGSUSED */
 static void
-zil_prt_rec_write(zilog_t *zilog, int txtype, const void *arg)
+zil_prt_rec_write(zilog_t *zilog, int txtype, void *arg)
 {
-	const lr_write_t *lr = arg;
+	lr_write_t *lr = arg;
 	abd_t *data;
-	const blkptr_t *bp = &lr->lr_blkptr;
+	blkptr_t *bp = &lr->lr_blkptr;
 	zbookmark_phys_t zb;
 	int verbose = MAX(dump_opt['d'], dump_opt['i']);
 	int error;
@@ -171,31 +161,28 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, const void *arg)
 	    (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_offset,
 	    (u_longlong_t)lr->lr_length);
 
-	if (txtype == TX_WRITE2 || verbose < 4)
+	if (txtype == TX_WRITE2 || verbose < 5)
 		return;
 
 	if (lr->lr_common.lrc_reclen == sizeof (lr_write_t)) {
 		(void) printf("%shas blkptr, %s\n", tab_prefix,
-		    !BP_IS_HOLE(bp) && BP_GET_LOGICAL_BIRTH(bp) >=
-		    spa_min_claim_txg(zilog->zl_spa) ?
+		    !BP_IS_HOLE(bp) &&
+		    bp->blk_birth >= spa_min_claim_txg(zilog->zl_spa) ?
 		    "will claim" : "won't claim");
 		print_log_bp(bp, tab_prefix);
 
-		if (verbose < 5)
-			return;
 		if (BP_IS_HOLE(bp)) {
 			(void) printf("\t\t\tLSIZE 0x%llx\n",
 			    (u_longlong_t)BP_GET_LSIZE(bp));
 			(void) printf("%s<hole>\n", tab_prefix);
 			return;
 		}
-		if (BP_GET_LOGICAL_BIRTH(bp) < zilog->zl_header->zh_claim_txg) {
+		if (bp->blk_birth < zilog->zl_header->zh_claim_txg) {
 			(void) printf("%s<block already committed>\n",
 			    tab_prefix);
 			return;
 		}
 
-		ASSERT3U(BP_GET_LSIZE(bp), !=, 0);
 		SET_BOOKMARK(&zb, dmu_objset_id(zilog->zl_os),
 		    lr->lr_foid, ZB_ZIL_LEVEL,
 		    lr->lr_offset / BP_GET_LSIZE(bp));
@@ -207,12 +194,9 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, const void *arg)
 		if (error)
 			goto out;
 	} else {
-		if (verbose < 5)
-			return;
-
 		/* data is stored after the end of the lr_write record */
 		data = abd_alloc(lr->lr_length, B_FALSE);
-		abd_copy_from_buf(data, &lr->lr_data[0], lr->lr_length);
+		abd_copy_from_buf(data, lr + 1, lr->lr_length);
 	}
 
 	(void) printf("%s", tab_prefix);
@@ -225,44 +209,22 @@ out:
 	abd_free(data);
 }
 
+/* ARGSUSED */
 static void
-zil_prt_rec_write_enc(zilog_t *zilog, int txtype, const void *arg)
+zil_prt_rec_truncate(zilog_t *zilog, int txtype, void *arg)
 {
-	(void) txtype;
-	const lr_write_t *lr = arg;
-	const blkptr_t *bp = &lr->lr_blkptr;
-	int verbose = MAX(dump_opt['d'], dump_opt['i']);
-
-	(void) printf("%s(encrypted)\n", tab_prefix);
-
-	if (verbose < 4)
-		return;
-
-	if (lr->lr_common.lrc_reclen == sizeof (lr_write_t)) {
-		(void) printf("%shas blkptr, %s\n", tab_prefix,
-		    !BP_IS_HOLE(bp) && BP_GET_LOGICAL_BIRTH(bp) >=
-		    spa_min_claim_txg(zilog->zl_spa) ?
-		    "will claim" : "won't claim");
-		print_log_bp(bp, tab_prefix);
-	}
-}
-
-static void
-zil_prt_rec_truncate(zilog_t *zilog, int txtype, const void *arg)
-{
-	(void) zilog, (void) txtype;
-	const lr_truncate_t *lr = arg;
+	lr_truncate_t *lr = arg;
 
 	(void) printf("%sfoid %llu, offset 0x%llx, length 0x%llx\n", tab_prefix,
 	    (u_longlong_t)lr->lr_foid, (longlong_t)lr->lr_offset,
 	    (u_longlong_t)lr->lr_length);
 }
 
+/* ARGSUSED */
 static void
-zil_prt_rec_setattr(zilog_t *zilog, int txtype, const void *arg)
+zil_prt_rec_setattr(zilog_t *zilog, int txtype, void *arg)
 {
-	(void) zilog, (void) txtype;
-	const lr_setattr_t *lr = arg;
+	lr_setattr_t *lr = arg;
 	time_t atime = (time_t)lr->lr_atime[0];
 	time_t mtime = (time_t)lr->lr_mtime[0];
 
@@ -304,83 +266,19 @@ zil_prt_rec_setattr(zilog_t *zilog, int txtype, const void *arg)
 	}
 }
 
+/* ARGSUSED */
 static void
-zil_prt_rec_setsaxattr(zilog_t *zilog, int txtype, const void *arg)
+zil_prt_rec_acl(zilog_t *zilog, int txtype, void *arg)
 {
-	(void) zilog, (void) txtype;
-	const lr_setsaxattr_t *lr = arg;
-
-	const char *name = (const char *)&lr->lr_data[0];
-	(void) printf("%sfoid %llu\n", tab_prefix,
-	    (u_longlong_t)lr->lr_foid);
-
-	(void) printf("%sXAT_NAME  %s\n", tab_prefix, name);
-	if (lr->lr_size == 0) {
-		(void) printf("%sXAT_VALUE  NULL\n", tab_prefix);
-	} else {
-		(void) printf("%sXAT_VALUE  ", tab_prefix);
-		const char *val = (const char *)&lr->lr_data[strlen(name) + 1];
-		for (int i = 0; i < lr->lr_size; i++) {
-			(void) printf("%c", *val);
-			val++;
-		}
-	}
-}
-
-static void
-zil_prt_rec_acl(zilog_t *zilog, int txtype, const void *arg)
-{
-	(void) zilog, (void) txtype;
-	const lr_acl_t *lr = arg;
+	lr_acl_t *lr = arg;
 
 	(void) printf("%sfoid %llu, aclcnt %llu\n", tab_prefix,
 	    (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_aclcnt);
 }
 
-static void
-zil_prt_rec_clone_range(zilog_t *zilog, int txtype, const void *arg)
-{
-	(void) zilog, (void) txtype;
-	const lr_clone_range_t *lr = arg;
-	int verbose = MAX(dump_opt['d'], dump_opt['i']);
-
-	(void) printf("%sfoid %llu, offset %llx, length %llx, blksize %llx\n",
-	    tab_prefix, (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_offset,
-	    (u_longlong_t)lr->lr_length, (u_longlong_t)lr->lr_blksz);
-
-	if (verbose < 4)
-		return;
-
-	for (unsigned int i = 0; i < lr->lr_nbps; i++) {
-		(void) printf("%s[%u/%llu] ", tab_prefix, i + 1,
-		    (u_longlong_t)lr->lr_nbps);
-		print_log_bp(&lr->lr_bps[i], "");
-	}
-}
-
-static void
-zil_prt_rec_clone_range_enc(zilog_t *zilog, int txtype, const void *arg)
-{
-	(void) zilog, (void) txtype;
-	const lr_clone_range_t *lr = arg;
-	int verbose = MAX(dump_opt['d'], dump_opt['i']);
-
-	(void) printf("%s(encrypted)\n", tab_prefix);
-
-	if (verbose < 4)
-		return;
-
-	for (unsigned int i = 0; i < lr->lr_nbps; i++) {
-		(void) printf("%s[%u/%llu] ", tab_prefix, i + 1,
-		    (u_longlong_t)lr->lr_nbps);
-		print_log_bp(&lr->lr_bps[i], "");
-	}
-}
-
-typedef void (*zil_prt_rec_func_t)(zilog_t *, int, const void *);
+typedef void (*zil_prt_rec_func_t)(zilog_t *, int, void *);
 typedef struct zil_rec_info {
 	zil_prt_rec_func_t	zri_print;
-	zil_prt_rec_func_t	zri_print_enc;
 	const char		*zri_name;
 	uint64_t		zri_count;
 } zil_rec_info_t;
@@ -395,9 +293,7 @@ static zil_rec_info_t zil_rec_info[TX_MAX_TYPE] = {
 	{.zri_print = zil_prt_rec_remove,   .zri_name = "TX_RMDIR           "},
 	{.zri_print = zil_prt_rec_link,	    .zri_name = "TX_LINK            "},
 	{.zri_print = zil_prt_rec_rename,   .zri_name = "TX_RENAME          "},
-	{.zri_print = zil_prt_rec_write,
-	    .zri_print_enc = zil_prt_rec_write_enc,
-	    .zri_name = "TX_WRITE           "},
+	{.zri_print = zil_prt_rec_write,    .zri_name = "TX_WRITE           "},
 	{.zri_print = zil_prt_rec_truncate, .zri_name = "TX_TRUNCATE        "},
 	{.zri_print = zil_prt_rec_setattr,  .zri_name = "TX_SETATTR         "},
 	{.zri_print = zil_prt_rec_acl,	    .zri_name = "TX_ACL_V0          "},
@@ -409,19 +305,12 @@ static zil_rec_info_t zil_rec_info[TX_MAX_TYPE] = {
 	{.zri_print = zil_prt_rec_create,   .zri_name = "TX_MKDIR_ATTR      "},
 	{.zri_print = zil_prt_rec_create,   .zri_name = "TX_MKDIR_ACL_ATTR  "},
 	{.zri_print = zil_prt_rec_write,    .zri_name = "TX_WRITE2          "},
-	{.zri_print = zil_prt_rec_setsaxattr,
-	    .zri_name = "TX_SETSAXATTR      "},
-	{.zri_print = zil_prt_rec_rename,   .zri_name = "TX_RENAME_EXCHANGE "},
-	{.zri_print = zil_prt_rec_rename,   .zri_name = "TX_RENAME_WHITEOUT "},
-	{.zri_print = zil_prt_rec_clone_range,
-	    .zri_print_enc = zil_prt_rec_clone_range_enc,
-	    .zri_name = "TX_CLONE_RANGE     "},
 };
 
+/* ARGSUSED */
 static int
-print_log_record(zilog_t *zilog, const lr_t *lr, void *arg, uint64_t claim_txg)
+print_log_record(zilog_t *zilog, lr_t *lr, void *arg, uint64_t claim_txg)
 {
-	(void) arg, (void) claim_txg;
 	int txtype;
 	int verbose = MAX(dump_opt['d'], dump_opt['i']);
 
@@ -441,8 +330,6 @@ print_log_record(zilog_t *zilog, const lr_t *lr, void *arg, uint64_t claim_txg)
 	if (txtype && verbose >= 3) {
 		if (!zilog->zl_os->os_encrypted) {
 			zil_rec_info[txtype].zri_print(zilog, txtype, lr);
-		} else if (zil_rec_info[txtype].zri_print_enc) {
-			zil_rec_info[txtype].zri_print_enc(zilog, txtype, lr);
 		} else {
 			(void) printf("%s(encrypted)\n", tab_prefix);
 		}
@@ -454,11 +341,10 @@ print_log_record(zilog_t *zilog, const lr_t *lr, void *arg, uint64_t claim_txg)
 	return (0);
 }
 
+/* ARGSUSED */
 static int
-print_log_block(zilog_t *zilog, const blkptr_t *bp, void *arg,
-    uint64_t claim_txg)
+print_log_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg)
 {
-	(void) arg;
 	char blkbuf[BP_SPRINTF_LEN + 10];
 	int verbose = MAX(dump_opt['d'], dump_opt['i']);
 	const char *claim;
@@ -476,7 +362,7 @@ print_log_block(zilog_t *zilog, const blkptr_t *bp, void *arg,
 
 	if (claim_txg != 0)
 		claim = "already claimed";
-	else if (BP_GET_LOGICAL_BIRTH(bp) >= spa_min_claim_txg(zilog->zl_spa))
+	else if (bp->blk_birth >= spa_min_claim_txg(zilog->zl_spa))
 		claim = "will claim";
 	else
 		claim = "won't claim";
@@ -509,6 +395,7 @@ print_log_stats(int verbose)
 	(void) printf("\n");
 }
 
+/* ARGSUSED */
 void
 dump_intent_log(zilog_t *zilog)
 {

cmd/zed/Makefile.am

@@ -1,46 +1,101 @@
-include $(srcdir)/%D%/zed.d/Makefile.am
+include $(top_srcdir)/config/Rules.am
 
-zed_CFLAGS  = $(AM_CFLAGS)
-zed_CFLAGS += $(LIBUDEV_CFLAGS) $(LIBUUID_CFLAGS)
+DEFAULT_INCLUDES += \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/lib/libspl/include
 
-sbin_PROGRAMS   += zed
-CPPCHECKTARGETS += zed
+EXTRA_DIST = zed.d/README \
+	zed.d/history_event-zfs-list-cacher.sh.in
 
-zed_SOURCES = \
-	%D%/zed.c \
-	%D%/zed.h \
-	%D%/zed_conf.c \
-	%D%/zed_conf.h \
-	%D%/zed_disk_event.c \
-	%D%/zed_disk_event.h \
-	%D%/zed_event.c \
-	%D%/zed_event.h \
-	%D%/zed_exec.c \
-	%D%/zed_exec.h \
-	%D%/zed_file.c \
-	%D%/zed_file.h \
-	%D%/zed_log.c \
-	%D%/zed_log.h \
-	%D%/zed_strings.c \
-	%D%/zed_strings.h \
-	\
-	%D%/agents/fmd_api.c \
-	%D%/agents/fmd_api.h \
-	%D%/agents/fmd_serd.c \
-	%D%/agents/fmd_serd.h \
-	%D%/agents/zfs_agents.c \
-	%D%/agents/zfs_agents.h \
-	%D%/agents/zfs_diagnosis.c \
-	%D%/agents/zfs_mod.c \
-	%D%/agents/zfs_retire.c
+sbin_PROGRAMS = zed
+
+ZED_SRC = \
+	zed.c \
+	zed.h \
+	zed_conf.c \
+	zed_conf.h \
+	zed_disk_event.c \
+	zed_disk_event.h \
+	zed_event.c \
+	zed_event.h \
+	zed_exec.c \
+	zed_exec.h \
+	zed_file.c \
+	zed_file.h \
+	zed_log.c \
+	zed_log.h \
+	zed_strings.c \
+	zed_strings.h
+
+FMA_SRC = \
+	agents/zfs_agents.c \
+	agents/zfs_agents.h \
+	agents/zfs_diagnosis.c \
+	agents/zfs_mod.c \
+	agents/zfs_retire.c \
+	agents/fmd_api.c \
+	agents/fmd_api.h \
+	agents/fmd_serd.c \
+	agents/fmd_serd.h
+
+zed_SOURCES = $(ZED_SRC) $(FMA_SRC)
 
 zed_LDADD = \
-	libzfs.la \
-	libzfs_core.la \
-	libnvpair.la \
-	libuutil.la
+	$(top_builddir)/lib/libnvpair/libnvpair.la \
+	$(top_builddir)/lib/libuutil/libuutil.la \
+	$(top_builddir)/lib/libzfs/libzfs.la
 
-zed_LDADD += -lrt $(LIBATOMIC_LIBS) $(LIBUDEV_LIBS) $(LIBUUID_LIBS)
+zed_LDADD += -lrt
 zed_LDFLAGS = -pthread
 
-dist_noinst_DATA += %D%/agents/README.md
+zedconfdir = $(sysconfdir)/zfs/zed.d
+
+dist_zedconf_DATA = \
+	zed.d/zed-functions.sh \
+	zed.d/zed.rc
+
+zedexecdir = $(zfsexecdir)/zed.d
+
+dist_zedexec_SCRIPTS = \
+	zed.d/all-debug.sh \
+	zed.d/all-syslog.sh \
+	zed.d/data-notify.sh \
+	zed.d/generic-notify.sh \
+	zed.d/resilver_finish-notify.sh \
+	zed.d/scrub_finish-notify.sh \
+	zed.d/statechange-led.sh \
+	zed.d/statechange-notify.sh \
+	zed.d/vdev_clear-led.sh \
+	zed.d/vdev_attach-led.sh \
+	zed.d/pool_import-led.sh \
+	zed.d/resilver_finish-start-scrub.sh
+
+nodist_zedexec_SCRIPTS = zed.d/history_event-zfs-list-cacher.sh
+
+$(nodist_zedexec_SCRIPTS): %: %.in
+	-$(SED) -e 's,@bindir\@,$(bindir),g' \
+		-e 's,@runstatedir\@,$(runstatedir),g' \
+		-e 's,@sbindir\@,$(sbindir),g' \
+		-e 's,@sysconfdir\@,$(sysconfdir),g' \
+		$< >'$@'
+
+zedconfdefaults = \
+	all-syslog.sh \
+	data-notify.sh \
+	resilver_finish-notify.sh \
+	scrub_finish-notify.sh \
+	statechange-led.sh \
+	statechange-notify.sh \
+	vdev_clear-led.sh \
+	vdev_attach-led.sh \
+	pool_import-led.sh \
+	resilver_finish-start-scrub.sh
+
+install-data-hook:
+	$(MKDIR_P) "$(DESTDIR)$(zedconfdir)"
+	for f in $(zedconfdefaults); do \
+	  test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
+	       -L "$(DESTDIR)$(zedconfdir)/$${f}" || \
+	    ln -s "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
+	done
+	chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"

cmd/zed/agents/fmd_api.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -7,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 https://opensource.org/licenses/CDDL-1.0.
+ * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
@@ -23,11 +22,10 @@
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  *
  * Copyright (c) 2016, Intel Corporation.
- * Copyright (c) 2023, Klara Inc.
  */
 
 /*
- * This file implements the minimal FMD module API required to support the
+ * This file imlements the minimal FMD module API required to support the
  * fault logic modules in ZED. This support includes module registration,
  * memory allocation, module property accessors, basic case management,
  * one-shot timers and SERD engines.
@@ -40,7 +38,7 @@
 #include <sys/fm/protocol.h>
 #include <uuid/uuid.h>
 #include <signal.h>
-#include <string.h>
+#include <strings.h>
 #include <time.h>
 
 #include "fmd_api.h"
@@ -99,7 +97,6 @@ _umem_logging_init(void)
 int
 fmd_hdl_register(fmd_hdl_t *hdl, int version, const fmd_hdl_info_t *mip)
 {
-	(void) version;
 	fmd_module_t *mp = (fmd_module_t *)hdl;
 
 	mp->mod_info = mip;
@@ -182,21 +179,18 @@ fmd_hdl_getspecific(fmd_hdl_t *hdl)
 void *
 fmd_hdl_alloc(fmd_hdl_t *hdl, size_t size, int flags)
 {
-	(void) hdl;
 	return (umem_alloc(size, flags));
 }
 
 void *
 fmd_hdl_zalloc(fmd_hdl_t *hdl, size_t size, int flags)
 {
-	(void) hdl;
 	return (umem_zalloc(size, flags));
 }
 
 void
 fmd_hdl_free(fmd_hdl_t *hdl, void *data, size_t size)
 {
-	(void) hdl;
 	umem_free(data, size);
 }
 
@@ -223,8 +217,6 @@ fmd_hdl_debug(fmd_hdl_t *hdl, const char *format, ...)
 int32_t
 fmd_prop_get_int32(fmd_hdl_t *hdl, const char *name)
 {
-	(void) hdl;
-
 	/*
 	 * These can be looked up in mp->modinfo->fmdi_props
 	 * For now we just hard code for phase 2. In the
@@ -233,6 +225,26 @@ fmd_prop_get_int32(fmd_hdl_t *hdl, const char *name)
 	if (strcmp(name, "spare_on_remove") == 0)
 		return (1);
 
+	if (strcmp(name, "io_N") == 0 || strcmp(name, "checksum_N") == 0)
+		return (10);	/* N = 10 events */
+
+	return (0);
+}
+
+int64_t
+fmd_prop_get_int64(fmd_hdl_t *hdl, const char *name)
+{
+	/*
+	 * These can be looked up in mp->modinfo->fmdi_props
+	 * For now we just hard code for phase 2. In the
+	 * future, there can be a ZED based override.
+	 */
+	if (strcmp(name, "remove_timeout") == 0)
+		return (15ULL * 1000ULL * 1000ULL * 1000ULL);	/* 15 sec */
+
+	if (strcmp(name, "io_T") == 0 || strcmp(name, "checksum_T") == 0)
+		return (1000ULL * 1000ULL * 1000ULL * 600ULL);	/* 10 min */
+
 	return (0);
 }
 
@@ -322,24 +334,22 @@ fmd_case_uuresolved(fmd_hdl_t *hdl, const char *uuid)
 	fmd_hdl_debug(hdl, "case resolved by uuid (%s)", uuid);
 }
 
-boolean_t
+int
 fmd_case_solved(fmd_hdl_t *hdl, fmd_case_t *cp)
 {
-	(void) hdl;
-	return (cp->ci_state >= FMD_CASE_SOLVED);
+	return ((cp->ci_state >= FMD_CASE_SOLVED) ? FMD_B_TRUE : FMD_B_FALSE);
 }
 
 void
 fmd_case_add_ereport(fmd_hdl_t *hdl, fmd_case_t *cp, fmd_event_t *ep)
 {
-	(void) hdl, (void) cp, (void) ep;
 }
 
 static void
 zed_log_fault(nvlist_t *nvl, const char *uuid, const char *code)
 {
 	nvlist_t *rsrc;
-	const char *strval;
+	char *strval;
 	uint64_t guid;
 	uint8_t byte;
 
@@ -352,7 +362,7 @@ zed_log_fault(nvlist_t *nvl, const char *uuid, const char *code)
 	if (code != NULL)
 		zed_log_msg(LOG_INFO, "\t%s: %s", FM_SUSPECT_DIAG_CODE, code);
 	if (nvlist_lookup_uint8(nvl, FM_FAULT_CERTAINTY, &byte) == 0)
-		zed_log_msg(LOG_INFO, "\t%s: %hhu", FM_FAULT_CERTAINTY, byte);
+		zed_log_msg(LOG_INFO, "\t%s: %llu", FM_FAULT_CERTAINTY, byte);
 	if (nvlist_lookup_nvlist(nvl, FM_FAULT_RESOURCE, &rsrc) == 0) {
 		if (nvlist_lookup_string(rsrc, FM_FMRI_SCHEME, &strval) == 0)
 			zed_log_msg(LOG_INFO, "\t%s: %s", FM_FMRI_SCHEME,
@@ -369,8 +379,7 @@ zed_log_fault(nvlist_t *nvl, const char *uuid, const char *code)
 static const char *
 fmd_fault_mkcode(nvlist_t *fault)
 {
-	const char *class;
-	const char *code = "-";
+	char *class, *code = "-";
 
 	/*
 	 * Note: message codes come from: openzfs/usr/src/cmd/fm/dicts/ZFS.po
@@ -419,8 +428,7 @@ fmd_case_add_suspect(fmd_hdl_t *hdl, fmd_case_t *cp, nvlist_t *fault)
 	err |= nvlist_add_string(nvl, FM_SUSPECT_DIAG_CODE, code);
 	err |= nvlist_add_int64_array(nvl, FM_SUSPECT_DIAG_TIME, tod, 2);
 	err |= nvlist_add_uint32(nvl, FM_SUSPECT_FAULT_SZ, 1);
-	err |= nvlist_add_nvlist_array(nvl, FM_SUSPECT_FAULT_LIST,
-	    (const nvlist_t **)&fault, 1);
+	err |= nvlist_add_nvlist_array(nvl, FM_SUSPECT_FAULT_LIST, &fault, 1);
 
 	if (err)
 		zed_log_die("failed to populate nvlist");
@@ -435,21 +443,19 @@ fmd_case_add_suspect(fmd_hdl_t *hdl, fmd_case_t *cp, nvlist_t *fault)
 void
 fmd_case_setspecific(fmd_hdl_t *hdl, fmd_case_t *cp, void *data)
 {
-	(void) hdl;
 	cp->ci_data = data;
 }
 
 void *
 fmd_case_getspecific(fmd_hdl_t *hdl, fmd_case_t *cp)
 {
-	(void) hdl;
 	return (cp->ci_data);
 }
 
 void
 fmd_buf_create(fmd_hdl_t *hdl, fmd_case_t *cp, const char *name, size_t size)
 {
-	assert(strcmp(name, "data") == 0), (void) name;
+	assert(strcmp(name, "data") == 0);
 	assert(cp->ci_bufptr == NULL);
 	assert(size < (1024 * 1024));
 
@@ -461,24 +467,22 @@ void
 fmd_buf_read(fmd_hdl_t *hdl, fmd_case_t *cp,
     const char *name, void *buf, size_t size)
 {
-	(void) hdl;
-	assert(strcmp(name, "data") == 0), (void) name;
+	assert(strcmp(name, "data") == 0);
 	assert(cp->ci_bufptr != NULL);
 	assert(size <= cp->ci_bufsiz);
 
-	memcpy(buf, cp->ci_bufptr, size);
+	bcopy(cp->ci_bufptr, buf, size);
 }
 
 void
 fmd_buf_write(fmd_hdl_t *hdl, fmd_case_t *cp,
     const char *name, const void *buf, size_t size)
 {
-	(void) hdl;
-	assert(strcmp(name, "data") == 0), (void) name;
+	assert(strcmp(name, "data") == 0);
 	assert(cp->ci_bufptr != NULL);
 	assert(cp->ci_bufsiz >= size);
 
-	memcpy(cp->ci_bufptr, buf, size);
+	bcopy(buf, cp->ci_bufptr, size);
 }
 
 /* SERD Engines */
@@ -515,19 +519,6 @@ fmd_serd_exists(fmd_hdl_t *hdl, const char *name)
 	return (fmd_serd_eng_lookup(&mp->mod_serds, name) != NULL);
 }
 
-int
-fmd_serd_active(fmd_hdl_t *hdl, const char *name)
-{
-	fmd_module_t *mp = (fmd_module_t *)hdl;
-	fmd_serd_eng_t *sgp;
-
-	if ((sgp = fmd_serd_eng_lookup(&mp->mod_serds, name)) == NULL) {
-		zed_log_msg(LOG_ERR, "serd engine '%s' does not exist", name);
-		return (0);
-	}
-	return (fmd_serd_eng_fired(sgp) || !fmd_serd_eng_empty(sgp));
-}
-
 void
 fmd_serd_reset(fmd_hdl_t *hdl, const char *name)
 {
@@ -536,10 +527,12 @@ fmd_serd_reset(fmd_hdl_t *hdl, const char *name)
 
 	if ((sgp = fmd_serd_eng_lookup(&mp->mod_serds, name)) == NULL) {
 		zed_log_msg(LOG_ERR, "serd engine '%s' does not exist", name);
-	} else {
-		fmd_serd_eng_reset(sgp);
-		fmd_hdl_debug(hdl, "serd_reset %s", name);
+		return;
 	}
+
+	fmd_serd_eng_reset(sgp);
+
+	fmd_hdl_debug(hdl, "serd_reset %s", name);
 }
 
 int
@@ -547,21 +540,16 @@ fmd_serd_record(fmd_hdl_t *hdl, const char *name, fmd_event_t *ep)
 {
 	fmd_module_t *mp = (fmd_module_t *)hdl;
 	fmd_serd_eng_t *sgp;
+	int err;
 
 	if ((sgp = fmd_serd_eng_lookup(&mp->mod_serds, name)) == NULL) {
 		zed_log_msg(LOG_ERR, "failed to add record to SERD engine '%s'",
 		    name);
-		return (0);
+		return (FMD_B_FALSE);
 	}
-	return (fmd_serd_eng_record(sgp, ep->ev_hrt));
-}
+	err = fmd_serd_eng_record(sgp, ep->ev_hrt);
 
-void
-fmd_serd_gc(fmd_hdl_t *hdl)
-{
-	fmd_module_t *mp = (fmd_module_t *)hdl;
-
-	fmd_serd_hash_apply(&mp->mod_serds, fmd_serd_eng_gc, NULL);
+	return (err);
 }
 
 /* FMD Timers */
@@ -575,10 +563,10 @@ _timer_notify(union sigval sv)
 	const fmd_hdl_ops_t *ops = mp->mod_info->fmdi_ops;
 	struct itimerspec its;
 
-	fmd_hdl_debug(hdl, "%s timer fired (%p)", mp->mod_name, ftp->ft_tid);
+	fmd_hdl_debug(hdl, "timer fired (%p)", ftp->ft_tid);
 
 	/* disarm the timer */
-	memset(&its, 0, sizeof (struct itimerspec));
+	bzero(&its, sizeof (struct itimerspec));
 	timer_settime(ftp->ft_tid, 0, &its, NULL);
 
 	/* Note that the fmdo_timeout can remove this timer */
@@ -594,7 +582,6 @@ _timer_notify(union sigval sv)
 fmd_timer_t *
 fmd_timer_install(fmd_hdl_t *hdl, void *arg, fmd_event_t *ep, hrtime_t delta)
 {
-	(void) ep;
 	struct sigevent sev;
 	struct itimerspec its;
 	fmd_timer_t *ftp;
@@ -612,7 +599,6 @@ fmd_timer_install(fmd_hdl_t *hdl, void *arg, fmd_event_t *ep, hrtime_t delta)
 	sev.sigev_notify_function = _timer_notify;
 	sev.sigev_notify_attributes = NULL;
 	sev.sigev_value.sival_ptr = ftp;
-	sev.sigev_signo = 0;
 
 	timer_create(CLOCK_REALTIME, &sev, &ftp->ft_tid);
 	timer_settime(ftp->ft_tid, 0, &its, NULL);
@@ -639,7 +625,6 @@ nvlist_t *
 fmd_nvl_create_fault(fmd_hdl_t *hdl, const char *class, uint8_t certainty,
     nvlist_t *asru, nvlist_t *fru, nvlist_t *resource)
 {
-	(void) hdl;
 	nvlist_t *nvl;
 	int err = 0;
 
@@ -703,8 +688,7 @@ fmd_strmatch(const char *s, const char *p)
 int
 fmd_nvl_class_match(fmd_hdl_t *hdl, nvlist_t *nvl, const char *pattern)
 {
-	(void) hdl;
-	const char *class;
+	char *class;
 
 	return (nvl != NULL &&
 	    nvlist_lookup_string(nvl, FM_CLASS, &class) == 0 &&
@@ -714,7 +698,6 @@ fmd_nvl_class_match(fmd_hdl_t *hdl, nvlist_t *nvl, const char *pattern)
 nvlist_t *
 fmd_nvl_alloc(fmd_hdl_t *hdl, int flags)
 {
-	(void) hdl, (void) flags;
 	nvlist_t *nvl = NULL;
 
 	if (nvlist_alloc(&nvl, NV_UNIQUE_NAME, 0) != 0)

cmd/zed/agents/fmd_api.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -7,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 https://opensource.org/licenses/CDDL-1.0.
+ * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
@@ -73,6 +72,10 @@ typedef struct fmd_case {
 } fmd_case_t;
 
 
+#define	FMD_B_FALSE	0		/* false value for booleans as int */
+#define	FMD_B_TRUE	1		/* true value for booleans as int */
+
+
 #define	FMD_CASE_UNSOLVED	0	/* case is not yet solved (waiting) */
 #define	FMD_CASE_SOLVED		1	/* case is solved (suspects added) */
 #define	FMD_CASE_CLOSE_WAIT	2	/* case is executing fmdo_close() */
@@ -152,6 +155,7 @@ extern void fmd_hdl_vdebug(fmd_hdl_t *, const char *, va_list);
 extern void fmd_hdl_debug(fmd_hdl_t *, const char *, ...);
 
 extern int32_t fmd_prop_get_int32(fmd_hdl_t *, const char *);
+extern int64_t fmd_prop_get_int64(fmd_hdl_t *, const char *);
 
 #define	FMD_STAT_NOALLOC	0x0	/* fmd should use caller's memory */
 #define	FMD_STAT_ALLOC		0x1	/* fmd should allocate stats memory */
@@ -172,7 +176,8 @@ extern int fmd_case_uuclosed(fmd_hdl_t *, const char *);
 extern int fmd_case_uuisresolved(fmd_hdl_t *, const char *);
 extern void fmd_case_uuresolved(fmd_hdl_t *, const char *);
 
-extern boolean_t fmd_case_solved(fmd_hdl_t *, fmd_case_t *);
+extern int fmd_case_solved(fmd_hdl_t *, fmd_case_t *);
+extern int fmd_case_closed(fmd_hdl_t *, fmd_case_t *);
 
 extern void fmd_case_add_ereport(fmd_hdl_t *, fmd_case_t *, fmd_event_t *);
 extern void fmd_case_add_serd(fmd_hdl_t *, fmd_case_t *, const char *);
@@ -195,12 +200,10 @@ extern size_t fmd_buf_size(fmd_hdl_t *, fmd_case_t *, const char *);
 extern void fmd_serd_create(fmd_hdl_t *, const char *, uint_t, hrtime_t);
 extern void fmd_serd_destroy(fmd_hdl_t *, const char *);
 extern int fmd_serd_exists(fmd_hdl_t *, const char *);
-extern int fmd_serd_active(fmd_hdl_t *, const char *);
 extern void fmd_serd_reset(fmd_hdl_t *, const char *);
 extern int fmd_serd_record(fmd_hdl_t *, const char *, fmd_event_t *);
 extern int fmd_serd_fired(fmd_hdl_t *, const char *);
 extern int fmd_serd_empty(fmd_hdl_t *, const char *);
-extern void fmd_serd_gc(fmd_hdl_t *);
 
 extern id_t fmd_timer_install(fmd_hdl_t *, void *, fmd_event_t *, hrtime_t);
 extern void fmd_timer_remove(fmd_hdl_t *, id_t);

cmd/zed/agents/fmd_serd.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -8,7 +7,7 @@
  * with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or https://opensource.org/licenses/CDDL-1.0.
+ * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
@@ -30,7 +29,7 @@
 #include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <sys/list.h>
 #include <sys/time.h>
 
@@ -75,18 +74,9 @@ fmd_serd_eng_alloc(const char *name, uint64_t n, hrtime_t t)
 	fmd_serd_eng_t *sgp;
 
 	sgp = malloc(sizeof (fmd_serd_eng_t));
-	if (sgp == NULL) {
-		perror("malloc");
-		exit(EXIT_FAILURE);
-	}
-	memset(sgp, 0, sizeof (fmd_serd_eng_t));
+	bzero(sgp, sizeof (fmd_serd_eng_t));
 
 	sgp->sg_name = strdup(name);
-	if (sgp->sg_name == NULL) {
-		perror("strdup");
-		exit(EXIT_FAILURE);
-	}
-
 	sgp->sg_flags = FMD_SERD_DIRTY;
 	sgp->sg_n = n;
 	sgp->sg_t = t;
@@ -133,12 +123,6 @@ fmd_serd_hash_create(fmd_serd_hash_t *shp)
 	shp->sh_hashlen = FMD_STR_BUCKETS;
 	shp->sh_hash = calloc(shp->sh_hashlen, sizeof (void *));
 	shp->sh_count = 0;
-
-	if (shp->sh_hash == NULL) {
-		perror("calloc");
-		exit(EXIT_FAILURE);
-	}
-
 }
 
 void
@@ -155,7 +139,7 @@ fmd_serd_hash_destroy(fmd_serd_hash_t *shp)
 	}
 
 	free(shp->sh_hash);
-	memset(shp, 0, sizeof (fmd_serd_hash_t));
+	bzero(shp, sizeof (fmd_serd_hash_t));
 }
 
 void
@@ -250,17 +234,13 @@ fmd_serd_eng_record(fmd_serd_eng_t *sgp, hrtime_t hrt)
 	if (sgp->sg_flags & FMD_SERD_FIRED) {
 		serd_log_msg("  SERD Engine: record %s already fired!",
 		    sgp->sg_name);
-		return (B_FALSE);
+		return (FMD_B_FALSE);
 	}
 
 	while (sgp->sg_count >= sgp->sg_n)
 		fmd_serd_eng_discard(sgp, list_tail(&sgp->sg_list));
 
 	sep = malloc(sizeof (fmd_serd_elem_t));
-	if (sep == NULL) {
-		perror("malloc");
-		exit(EXIT_FAILURE);
-	}
 	sep->se_hrt = hrt;
 
 	list_insert_head(&sgp->sg_list, sep);
@@ -279,11 +259,11 @@ fmd_serd_eng_record(fmd_serd_eng_t *sgp, hrtime_t hrt)
 	    fmd_event_delta(oep->se_hrt, sep->se_hrt) <= sgp->sg_t) {
 		sgp->sg_flags |= FMD_SERD_FIRED | FMD_SERD_DIRTY;
 		serd_log_msg("  SERD Engine: fired %s", sgp->sg_name);
-		return (B_TRUE);
+		return (FMD_B_TRUE);
 	}
 
 	sgp->sg_flags |= FMD_SERD_DIRTY;
-	return (B_FALSE);
+	return (FMD_B_FALSE);
 }
 
 int
@@ -301,7 +281,7 @@ fmd_serd_eng_empty(fmd_serd_eng_t *sgp)
 void
 fmd_serd_eng_reset(fmd_serd_eng_t *sgp)
 {
-	serd_log_msg("  SERD Engine: resetting %s", sgp->sg_name);
+	serd_log_msg("  SERD Engine: reseting %s", sgp->sg_name);
 
 	while (sgp->sg_count != 0)
 		fmd_serd_eng_discard(sgp, list_head(&sgp->sg_list));
@@ -311,9 +291,8 @@ fmd_serd_eng_reset(fmd_serd_eng_t *sgp)
 }
 
 void
-fmd_serd_eng_gc(fmd_serd_eng_t *sgp, void *arg)
+fmd_serd_eng_gc(fmd_serd_eng_t *sgp)
 {
-	(void) arg;
 	fmd_serd_elem_t *sep, *nep;
 	hrtime_t hrt;
 

cmd/zed/agents/fmd_serd.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -8,7 +7,7 @@
  * with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or https://opensource.org/licenses/CDDL-1.0.
+ * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
@@ -78,7 +77,7 @@ extern int fmd_serd_eng_fired(fmd_serd_eng_t *);
 extern int fmd_serd_eng_empty(fmd_serd_eng_t *);
 
 extern void fmd_serd_eng_reset(fmd_serd_eng_t *);
-extern void fmd_serd_eng_gc(fmd_serd_eng_t *, void *);
+extern void fmd_serd_eng_gc(fmd_serd_eng_t *);
 
 #ifdef	__cplusplus
 }

cmd/zed/agents/zfs_agents.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -14,7 +13,6 @@
 /*
  * Copyright (c) 2016, Intel Corporation.
  * Copyright (c) 2018, loli10K <ezomori.nozomu@gmail.com>
- * Copyright (c) 2021 Hewlett Packard Enterprise Development LP
  */
 
 #include <libnvpair.h>
@@ -65,7 +63,7 @@ typedef enum device_type {
 typedef struct guid_search {
 	uint64_t	gs_pool_guid;
 	uint64_t	gs_vdev_guid;
-	const char	*gs_devid;
+	char		*gs_devid;
 	device_type_t	gs_vdev_type;
 	uint64_t	gs_vdev_expandtime;	/* vdev expansion time */
 } guid_search_t;
@@ -78,10 +76,9 @@ static boolean_t
 zfs_agent_iter_vdev(zpool_handle_t *zhp, nvlist_t *nvl, void *arg)
 {
 	guid_search_t *gsp = arg;
-	const char *path = NULL;
+	char *path = NULL;
 	uint_t c, children;
 	nvlist_t **child;
-	uint64_t vdev_guid;
 
 	/*
 	 * First iterate over any children.
@@ -102,7 +99,7 @@ zfs_agent_iter_vdev(zpool_handle_t *zhp, nvlist_t *nvl, void *arg)
 	    &child, &children) == 0) {
 		for (c = 0; c < children; c++) {
 			if (zfs_agent_iter_vdev(zhp, child[c], gsp)) {
-				gsp->gs_vdev_type = DEVICE_TYPE_SPARE;
+				gsp->gs_vdev_type = DEVICE_TYPE_L2ARC;
 				return (B_TRUE);
 			}
 		}
@@ -111,7 +108,7 @@ zfs_agent_iter_vdev(zpool_handle_t *zhp, nvlist_t *nvl, void *arg)
 	    &child, &children) == 0) {
 		for (c = 0; c < children; c++) {
 			if (zfs_agent_iter_vdev(zhp, child[c], gsp)) {
-				gsp->gs_vdev_type = DEVICE_TYPE_L2ARC;
+				gsp->gs_vdev_type = DEVICE_TYPE_SPARE;
 				return (B_TRUE);
 			}
 		}
@@ -119,8 +116,7 @@ zfs_agent_iter_vdev(zpool_handle_t *zhp, nvlist_t *nvl, void *arg)
 	/*
 	 * On a devid match, grab the vdev guid and expansion time, if any.
 	 */
-	if (gsp->gs_devid != NULL &&
-	    (nvlist_lookup_string(nvl, ZPOOL_CONFIG_DEVID, &path) == 0) &&
+	if ((nvlist_lookup_string(nvl, ZPOOL_CONFIG_DEVID, &path) == 0) &&
 	    (strcmp(gsp->gs_devid, path) == 0)) {
 		(void) nvlist_lookup_uint64(nvl, ZPOOL_CONFIG_GUID,
 		    &gsp->gs_vdev_guid);
@@ -128,21 +124,6 @@ zfs_agent_iter_vdev(zpool_handle_t *zhp, nvlist_t *nvl, void *arg)
 		    &gsp->gs_vdev_expandtime);
 		return (B_TRUE);
 	}
-	/*
-	 * Otherwise, on a vdev guid match, grab the devid and expansion
-	 * time. The devid might be missing on removal since its not part
-	 * of blkid cache and L2ARC VDEV does not contain pool guid in its
-	 * blkid, so this is a special case for L2ARC VDEV.
-	 */
-	else if (gsp->gs_vdev_guid != 0 && gsp->gs_devid == NULL &&
-	    nvlist_lookup_uint64(nvl, ZPOOL_CONFIG_GUID, &vdev_guid) == 0 &&
-	    gsp->gs_vdev_guid == vdev_guid) {
-		(void) nvlist_lookup_string(nvl, ZPOOL_CONFIG_DEVID,
-		    &gsp->gs_devid);
-		(void) nvlist_lookup_uint64(nvl, ZPOOL_CONFIG_EXPANSION_TIME,
-		    &gsp->gs_vdev_expandtime);
-		return (B_TRUE);
-	}
 
 	return (B_FALSE);
 }
@@ -165,13 +146,13 @@ zfs_agent_iter_pool(zpool_handle_t *zhp, void *arg)
 	/*
 	 * if a match was found then grab the pool guid
 	 */
-	if (gsp->gs_vdev_guid && gsp->gs_devid) {
+	if (gsp->gs_vdev_guid) {
 		(void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_GUID,
 		    &gsp->gs_pool_guid);
 	}
 
 	zpool_close(zhp);
-	return (gsp->gs_devid != NULL && gsp->gs_vdev_guid != 0);
+	return (gsp->gs_vdev_guid != 0);
 }
 
 void
@@ -195,12 +176,10 @@ zfs_agent_post_event(const char *class, const char *subclass, nvlist_t *nvl)
 	}
 
 	/*
-	 * On Linux, we don't get the expected FM_RESOURCE_REMOVED ereport
-	 * from the vdev_disk layer after a hot unplug. Fortunately we do
-	 * get an EC_DEV_REMOVE from our disk monitor and it is a suitable
+	 * On ZFS on Linux, we don't get the expected FM_RESOURCE_REMOVED
+	 * ereport from vdev_disk layer after a hot unplug. Fortunately we
+	 * get a EC_DEV_REMOVE from our disk monitor and it is a suitable
 	 * proxy so we remap it here for the benefit of the diagnosis engine.
-	 * Starting in OpenZFS 2.0, we do get FM_RESOURCE_REMOVED from the spa
-	 * layer. Processing multiple FM_RESOURCE_REMOVED events is not harmful.
 	 */
 	if ((strcmp(class, EC_DEV_REMOVE) == 0) &&
 	    (strcmp(subclass, ESC_DISK) == 0) &&
@@ -212,13 +191,11 @@ zfs_agent_post_event(const char *class, const char *subclass, nvlist_t *nvl)
 		uint64_t pool_guid = 0, vdev_guid = 0;
 		guid_search_t search = { 0 };
 		device_type_t devtype = DEVICE_TYPE_PRIMARY;
-		const char *devid = NULL;
 
 		class = "resource.fs.zfs.removed";
 		subclass = "";
 
 		(void) nvlist_add_string(payload, FM_CLASS, class);
-		(void) nvlist_lookup_string(nvl, DEV_IDENTIFIER, &devid);
 		(void) nvlist_lookup_uint64(nvl, ZFS_EV_POOL_GUID, &pool_guid);
 		(void) nvlist_lookup_uint64(nvl, ZFS_EV_VDEV_GUID, &vdev_guid);
 
@@ -228,25 +205,15 @@ zfs_agent_post_event(const char *class, const char *subclass, nvlist_t *nvl)
 		(void) nvlist_add_int64_array(payload, FM_EREPORT_TIME, tod, 2);
 
 		/*
-		 * If devid is missing but vdev_guid is available, find devid
-		 * and pool_guid from vdev_guid.
 		 * For multipath, spare and l2arc devices ZFS_EV_VDEV_GUID or
 		 * ZFS_EV_POOL_GUID may be missing so find them.
 		 */
-		if (devid == NULL || pool_guid == 0 || vdev_guid == 0) {
-			if (devid == NULL)
-				search.gs_vdev_guid = vdev_guid;
-			else
-				search.gs_devid = devid;
-			zpool_iter(g_zfs_hdl, zfs_agent_iter_pool, &search);
-			if (devid == NULL)
-				devid = search.gs_devid;
-			if (pool_guid == 0)
-				pool_guid = search.gs_pool_guid;
-			if (vdev_guid == 0)
-				vdev_guid = search.gs_vdev_guid;
-			devtype = search.gs_vdev_type;
-		}
+		(void) nvlist_lookup_string(nvl, DEV_IDENTIFIER,
+		    &search.gs_devid);
+		(void) zpool_iter(g_zfs_hdl, zfs_agent_iter_pool, &search);
+		pool_guid = search.gs_pool_guid;
+		vdev_guid = search.gs_vdev_guid;
+		devtype = search.gs_vdev_type;
 
 		/*
 		 * We want to avoid reporting "remove" events coming from
@@ -258,9 +225,7 @@ zfs_agent_post_event(const char *class, const char *subclass, nvlist_t *nvl)
 		    search.gs_vdev_expandtime + 10 > tv.tv_sec) {
 			zed_log_msg(LOG_INFO, "agent post event: ignoring '%s' "
 			    "for recently expanded device '%s'", EC_DEV_REMOVE,
-			    devid);
-			fnvlist_free(payload);
-			free(event);
+			    search.gs_devid);
 			goto out;
 		}
 
@@ -352,8 +317,6 @@ zfs_agent_dispatch(const char *class, const char *subclass, nvlist_t *nvl)
 static void *
 zfs_agent_consumer_thread(void *arg)
 {
-	(void) arg;
-
 	for (;;) {
 		agent_event_t *event;
 
@@ -370,7 +333,9 @@ zfs_agent_consumer_thread(void *arg)
 			return (NULL);
 		}
 
-		if ((event = list_remove_head(&agent_events)) != NULL) {
+		if ((event = (list_head(&agent_events))) != NULL) {
+			list_remove(&agent_events, event);
+
 			(void) pthread_mutex_unlock(&agent_lock);
 
 			/* dispatch to all event subscribers */
@@ -417,7 +382,6 @@ zfs_agent_init(libzfs_handle_t *zfs_hdl)
 		list_destroy(&agent_events);
 		zed_log_die("Failed to initialize agents");
 	}
-	pthread_setname_np(g_agents_tid, "agents");
 }
 
 void
@@ -433,7 +397,8 @@ zfs_agent_fini(void)
 	(void) pthread_join(g_agents_tid, NULL);
 
 	/* drain any pending events */
-	while ((event = list_remove_head(&agent_events)) != NULL) {
+	while ((event = (list_head(&agent_events))) != NULL) {
+		list_remove(&agent_events, event);
 		nvlist_free(event->ae_nvl);
 		free(event);
 	}

cmd/zed/agents/zfs_agents.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zed/agents/zfs_diagnosis.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -7,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 https://opensource.org/licenses/CDDL-1.0.
+ * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
@@ -24,11 +23,11 @@
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2016, Intel Corporation.
- * Copyright (c) 2023, Klara Inc.
  */
 
 #include <stddef.h>
 #include <string.h>
+#include <strings.h>
 #include <libuutil.h>
 #include <libzfs.h>
 #include <sys/types.h>
@@ -36,29 +35,14 @@
 #include <sys/fs/zfs.h>
 #include <sys/fm/protocol.h>
 #include <sys/fm/fs/zfs.h>
-#include <sys/zio.h>
 
 #include "zfs_agents.h"
 #include "fmd_api.h"
 
 /*
- * Default values for the serd engine when processing checksum or io errors. The
- * semantics are N <events> in T <seconds>.
- */
-#define	DEFAULT_CHECKSUM_N	10	/* events */
-#define	DEFAULT_CHECKSUM_T	600	/* seconds */
-#define	DEFAULT_IO_N		10	/* events */
-#define	DEFAULT_IO_T		600	/* seconds */
-#define	DEFAULT_SLOW_IO_N	10	/* events */
-#define	DEFAULT_SLOW_IO_T	30	/* seconds */
-
-#define	CASE_GC_TIMEOUT_SECS	43200	/* 12 hours */
-
-/*
- * Our serd engines are named in the following format:
- *     'zfs_<pool_guid>_<vdev_guid>_{checksum,io,slow_io}'
- * This #define reserves enough space for two 64-bit hex values plus the
- * length of the longest string.
+ * Our serd engines are named 'zfs_<pool_guid>_<vdev_guid>_{checksum,io}'.  This
+ * #define reserves enough space for two 64-bit hex values plus the length of
+ * the longest string.
  */
 #define	MAX_SERDLEN	(16 * 2 + sizeof ("zfs___checksum"))
 
@@ -72,11 +56,9 @@ typedef struct zfs_case_data {
 	uint64_t	zc_ena;
 	uint64_t	zc_pool_guid;
 	uint64_t	zc_vdev_guid;
-	uint64_t	zc_parent_guid;
 	int		zc_pool_state;
 	char		zc_serd_checksum[MAX_SERDLEN];
 	char		zc_serd_io[MAX_SERDLEN];
-	char		zc_serd_slow_io[MAX_SERDLEN];
 	int		zc_has_remove_timer;
 } zfs_case_data_t;
 
@@ -123,8 +105,7 @@ zfs_de_stats_t zfs_stats = {
 	{ "resource_drops", FMD_TYPE_UINT64, "resource related ereports" }
 };
 
-/* wait 15 seconds after a removal */
-static hrtime_t zfs_remove_timeout = SEC2NSEC(15);
+static hrtime_t zfs_remove_timeout;
 
 uu_list_pool_t *zfs_case_pool;
 uu_list_t *zfs_cases;
@@ -134,13 +115,11 @@ uu_list_t *zfs_cases;
 #define	ZFS_MAKE_EREPORT(type)	\
     FM_EREPORT_CLASS "." ZFS_ERROR_CLASS "." type
 
-static void zfs_purge_cases(fmd_hdl_t *hdl);
-
 /*
  * Write out the persistent representation of an active case.
  */
 static void
-zfs_case_serialize(zfs_case_t *zcp)
+zfs_case_serialize(fmd_hdl_t *hdl, zfs_case_t *zcp)
 {
 	zcp->zc_data.zc_version = CASE_DATA_VERSION_SERD;
 }
@@ -182,64 +161,6 @@ zfs_case_unserialize(fmd_hdl_t *hdl, fmd_case_t *cp)
 	return (zcp);
 }
 
-/*
- * Return count of other unique SERD cases under same vdev parent
- */
-static uint_t
-zfs_other_serd_cases(fmd_hdl_t *hdl, const zfs_case_data_t *zfs_case)
-{
-	zfs_case_t *zcp;
-	uint_t cases = 0;
-	static hrtime_t next_check = 0;
-
-	/*
-	 * Note that plumbing in some external GC would require adding locking,
-	 * since most of this module code is not thread safe and assumes there
-	 * is only one thread running against the module. So we perform GC here
-	 * inline periodically so that future delay induced faults will be
-	 * possible once the issue causing multiple vdev delays is resolved.
-	 */
-	if (gethrestime_sec() > next_check) {
-		/* Periodically purge old SERD entries and stale cases */
-		fmd_serd_gc(hdl);
-		zfs_purge_cases(hdl);
-		next_check = gethrestime_sec() + CASE_GC_TIMEOUT_SECS;
-	}
-
-	for (zcp = uu_list_first(zfs_cases); zcp != NULL;
-	    zcp = uu_list_next(zfs_cases, zcp)) {
-		zfs_case_data_t *zcd = &zcp->zc_data;
-
-		/*
-		 * must be same pool and parent vdev but different leaf vdev
-		 */
-		if (zcd->zc_pool_guid != zfs_case->zc_pool_guid ||
-		    zcd->zc_parent_guid != zfs_case->zc_parent_guid ||
-		    zcd->zc_vdev_guid == zfs_case->zc_vdev_guid) {
-			continue;
-		}
-
-		/*
-		 * Check if there is another active serd case besides zfs_case
-		 *
-		 * Only one serd engine will be assigned to the case
-		 */
-		if (zcd->zc_serd_checksum[0] == zfs_case->zc_serd_checksum[0] &&
-		    fmd_serd_active(hdl, zcd->zc_serd_checksum)) {
-			cases++;
-		}
-		if (zcd->zc_serd_io[0] == zfs_case->zc_serd_io[0] &&
-		    fmd_serd_active(hdl, zcd->zc_serd_io)) {
-			cases++;
-		}
-		if (zcd->zc_serd_slow_io[0] == zfs_case->zc_serd_slow_io[0] &&
-		    fmd_serd_active(hdl, zcd->zc_serd_slow_io)) {
-			cases++;
-		}
-	}
-	return (cases);
-}
-
 /*
  * Iterate over any active cases.  If any cases are associated with a pool or
  * vdev which is no longer present on the system, close the associated case.
@@ -288,10 +209,10 @@ zfs_mark_vdev(uint64_t pool_guid, nvlist_t *vd, er_timeval_t *loaded)
 	}
 }
 
+/*ARGSUSED*/
 static int
 zfs_mark_pool(zpool_handle_t *zhp, void *unused)
 {
-	(void) unused;
 	zfs_case_t *zcp;
 	uint64_t pool_guid;
 	uint64_t *tod;
@@ -446,21 +367,14 @@ zfs_serd_name(char *buf, uint64_t pool_guid, uint64_t vdev_guid,
 	    (long long unsigned int)vdev_guid, type);
 }
 
-static void
-zfs_case_retire(fmd_hdl_t *hdl, zfs_case_t *zcp)
-{
-	fmd_hdl_debug(hdl, "retiring case");
-
-	fmd_case_close(hdl, zcp->zc_case);
-}
-
 /*
  * Solve a given ZFS case.  This first checks to make sure the diagnosis is
  * still valid, as well as cleaning up any pending timer associated with the
  * case.
  */
 static void
-zfs_case_solve(fmd_hdl_t *hdl, zfs_case_t *zcp, const char *faultname)
+zfs_case_solve(fmd_hdl_t *hdl, zfs_case_t *zcp, const char *faultname,
+    boolean_t checkunusable)
 {
 	nvlist_t *detector, *fault;
 	boolean_t serialize;
@@ -498,7 +412,7 @@ zfs_case_solve(fmd_hdl_t *hdl, zfs_case_t *zcp, const char *faultname)
 		serialize = B_TRUE;
 	}
 	if (serialize)
-		zfs_case_serialize(zcp);
+		zfs_case_serialize(hdl, zcp);
 
 	nvlist_free(detector);
 }
@@ -510,10 +424,10 @@ timeval_earlier(er_timeval_t *a, er_timeval_t *b)
 	    (a->ertv_sec == b->ertv_sec && a->ertv_nsec < b->ertv_nsec));
 }
 
+/*ARGSUSED*/
 static void
 zfs_ereport_when(fmd_hdl_t *hdl, nvlist_t *nvl, er_timeval_t *when)
 {
-	(void) hdl;
 	int64_t *tod;
 	uint_t	nelem;
 
@@ -526,51 +440,22 @@ zfs_ereport_when(fmd_hdl_t *hdl, nvlist_t *nvl, er_timeval_t *when)
 	}
 }
 
-/*
- * Record the specified event in the SERD engine and return a
- * boolean value indicating whether or not the engine fired as
- * the result of inserting this event.
- *
- * When the pool has similar active cases on other vdevs, then
- * the fired state is disregarded and the case is retired.
- */
-static int
-zfs_fm_serd_record(fmd_hdl_t *hdl, const char *name, fmd_event_t *ep,
-    zfs_case_t *zcp, const char *err_type)
-{
-	int fired = fmd_serd_record(hdl, name, ep);
-	int peers = 0;
-
-	if (fired && (peers = zfs_other_serd_cases(hdl, &zcp->zc_data)) > 0) {
-		fmd_hdl_debug(hdl, "pool %llu is tracking %d other %s cases "
-		    "-- skip faulting the vdev %llu",
-		    (u_longlong_t)zcp->zc_data.zc_pool_guid,
-		    peers, err_type,
-		    (u_longlong_t)zcp->zc_data.zc_vdev_guid);
-		zfs_case_retire(hdl, zcp);
-		fired = 0;
-	}
-
-	return (fired);
-}
-
 /*
  * Main fmd entry point.
  */
+/*ARGSUSED*/
 static void
 zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 {
 	zfs_case_t *zcp, *dcp;
 	int32_t pool_state;
-	uint64_t ena, pool_guid, vdev_guid, parent_guid;
-	uint64_t checksum_n, checksum_t;
-	uint64_t io_n, io_t;
+	uint64_t ena, pool_guid, vdev_guid;
 	er_timeval_t pool_load;
 	er_timeval_t er_when;
 	nvlist_t *detector;
 	boolean_t pool_found = B_FALSE;
 	boolean_t isresource;
-	const char *type;
+	char *type;
 
 	/*
 	 * We subscribe to notifications for vdev or pool removal.  In these
@@ -652,9 +537,6 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 	if (nvlist_lookup_uint64(nvl,
 	    FM_EREPORT_PAYLOAD_ZFS_VDEV_GUID, &vdev_guid) != 0)
 		vdev_guid = 0;
-	if (nvlist_lookup_uint64(nvl,
-	    FM_EREPORT_PAYLOAD_ZFS_PARENT_GUID, &parent_guid) != 0)
-		parent_guid = 0;
 	if (nvlist_lookup_uint64(nvl, FM_EREPORT_ENA, &ena) != 0)
 		ena = 0;
 
@@ -741,7 +623,9 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 		if (strcmp(class,
 		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_DATA)) == 0 ||
 		    strcmp(class,
-		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_CONFIG_CACHE_WRITE)) == 0) {
+		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_CONFIG_CACHE_WRITE)) == 0 ||
+		    strcmp(class,
+		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_DELAY)) == 0) {
 			zfs_stats.resource_drops.fmds_value.ui64++;
 			return;
 		}
@@ -765,7 +649,6 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 		data.zc_ena = ena;
 		data.zc_pool_guid = pool_guid;
 		data.zc_vdev_guid = vdev_guid;
-		data.zc_parent_guid = parent_guid;
 		data.zc_pool_state = (int)pool_state;
 
 		fmd_buf_write(hdl, cs, CASE_DATA, &data, sizeof (data));
@@ -803,16 +686,13 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 			if (zcp->zc_data.zc_has_remove_timer) {
 				fmd_timer_remove(hdl, zcp->zc_remove_timer);
 				zcp->zc_data.zc_has_remove_timer = 0;
-				zfs_case_serialize(zcp);
+				zfs_case_serialize(hdl, zcp);
 			}
 			if (zcp->zc_data.zc_serd_io[0] != '\0')
 				fmd_serd_reset(hdl, zcp->zc_data.zc_serd_io);
 			if (zcp->zc_data.zc_serd_checksum[0] != '\0')
 				fmd_serd_reset(hdl,
 				    zcp->zc_data.zc_serd_checksum);
-			if (zcp->zc_data.zc_serd_slow_io[0] != '\0')
-				fmd_serd_reset(hdl,
-				    zcp->zc_data.zc_serd_slow_io);
 		} else if (fmd_nvl_class_match(hdl, nvl,
 		    ZFS_MAKE_RSRC(FM_RESOURCE_STATECHANGE))) {
 			uint64_t state = 0;
@@ -841,11 +721,7 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 	if (fmd_case_solved(hdl, zcp->zc_case))
 		return;
 
-	if (vdev_guid)
-		fmd_hdl_debug(hdl, "error event '%s', vdev %llu", class,
-		    vdev_guid);
-	else
-		fmd_hdl_debug(hdl, "error event '%s'", class);
+	fmd_hdl_debug(hdl, "error event '%s'", class);
 
 	/*
 	 * Determine if we should solve the case and generate a fault.  We solve
@@ -875,18 +751,18 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 				fmd_case_close(hdl, dcp->zc_case);
 		}
 
-		zfs_case_solve(hdl, zcp, "fault.fs.zfs.pool");
+		zfs_case_solve(hdl, zcp, "fault.fs.zfs.pool", B_TRUE);
 	} else if (fmd_nvl_class_match(hdl, nvl,
 	    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_LOG_REPLAY))) {
 		/*
 		 * Pool level fault for reading the intent logs.
 		 */
-		zfs_case_solve(hdl, zcp, "fault.fs.zfs.log_replay");
+		zfs_case_solve(hdl, zcp, "fault.fs.zfs.log_replay", B_TRUE);
 	} else if (fmd_nvl_class_match(hdl, nvl, "ereport.fs.zfs.vdev.*")) {
 		/*
 		 * Device fault.
 		 */
-		zfs_case_solve(hdl, zcp, "fault.fs.zfs.device");
+		zfs_case_solve(hdl, zcp, "fault.fs.zfs.device",  B_TRUE);
 	} else if (fmd_nvl_class_match(hdl, nvl,
 	    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_IO)) ||
 	    fmd_nvl_class_match(hdl, nvl,
@@ -894,12 +770,9 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 	    fmd_nvl_class_match(hdl, nvl,
 	    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_IO_FAILURE)) ||
 	    fmd_nvl_class_match(hdl, nvl,
-	    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_DELAY)) ||
-	    fmd_nvl_class_match(hdl, nvl,
 	    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_PROBE_FAILURE))) {
-		const char *failmode = NULL;
+		char *failmode = NULL;
 		boolean_t checkremove = B_FALSE;
-		uint32_t pri = 0;
 
 		/*
 		 * If this is a checksum or I/O error, then toss it into the
@@ -911,111 +784,30 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 		if (fmd_nvl_class_match(hdl, nvl,
 		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_IO))) {
 			if (zcp->zc_data.zc_serd_io[0] == '\0') {
-				if (nvlist_lookup_uint64(nvl,
-				    FM_EREPORT_PAYLOAD_ZFS_VDEV_IO_N,
-				    &io_n) != 0) {
-					io_n = DEFAULT_IO_N;
-				}
-				if (nvlist_lookup_uint64(nvl,
-				    FM_EREPORT_PAYLOAD_ZFS_VDEV_IO_T,
-				    &io_t) != 0) {
-					io_t = DEFAULT_IO_T;
-				}
 				zfs_serd_name(zcp->zc_data.zc_serd_io,
 				    pool_guid, vdev_guid, "io");
 				fmd_serd_create(hdl, zcp->zc_data.zc_serd_io,
-				    io_n,
-				    SEC2NSEC(io_t));
-				zfs_case_serialize(zcp);
+				    fmd_prop_get_int32(hdl, "io_N"),
+				    fmd_prop_get_int64(hdl, "io_T"));
+				zfs_case_serialize(hdl, zcp);
 			}
-			if (zfs_fm_serd_record(hdl, zcp->zc_data.zc_serd_io,
-			    ep, zcp, "io error")) {
+			if (fmd_serd_record(hdl, zcp->zc_data.zc_serd_io, ep))
 				checkremove = B_TRUE;
-			}
-		} else if (fmd_nvl_class_match(hdl, nvl,
-		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_DELAY))) {
-			uint64_t slow_io_n, slow_io_t;
-
-			/*
-			 * Create a slow io SERD engine when the VDEV has the
-			 * 'vdev_slow_io_n' and 'vdev_slow_io_n' properties.
-			 */
-			if (zcp->zc_data.zc_serd_slow_io[0] == '\0' &&
-			    nvlist_lookup_uint64(nvl,
-			    FM_EREPORT_PAYLOAD_ZFS_VDEV_SLOW_IO_N,
-			    &slow_io_n) == 0 &&
-			    nvlist_lookup_uint64(nvl,
-			    FM_EREPORT_PAYLOAD_ZFS_VDEV_SLOW_IO_T,
-			    &slow_io_t) == 0) {
-				zfs_serd_name(zcp->zc_data.zc_serd_slow_io,
-				    pool_guid, vdev_guid, "slow_io");
-				fmd_serd_create(hdl,
-				    zcp->zc_data.zc_serd_slow_io,
-				    slow_io_n,
-				    SEC2NSEC(slow_io_t));
-				zfs_case_serialize(zcp);
-			}
-			/* Pass event to SERD engine and see if this triggers */
-			if (zcp->zc_data.zc_serd_slow_io[0] != '\0' &&
-			    zfs_fm_serd_record(hdl,
-			    zcp->zc_data.zc_serd_slow_io, ep, zcp, "slow io")) {
-				zfs_case_solve(hdl, zcp,
-				    "fault.fs.zfs.vdev.slow_io");
-			}
 		} else if (fmd_nvl_class_match(hdl, nvl,
 		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_CHECKSUM))) {
-			uint64_t flags = 0;
-			int32_t flags32 = 0;
-			/*
-			 * We ignore ereports for checksum errors generated by
-			 * scrub/resilver I/O to avoid potentially further
-			 * degrading the pool while it's being repaired.
-			 *
-			 * Note that FM_EREPORT_PAYLOAD_ZFS_ZIO_FLAGS used to
-			 * be int32. To allow newer zed to work on older
-			 * kernels, if we don't find the flags, we look for
-			 * the older ones too.
-			 */
-			if (((nvlist_lookup_uint32(nvl,
-			    FM_EREPORT_PAYLOAD_ZFS_ZIO_PRIORITY, &pri) == 0) &&
-			    (pri == ZIO_PRIORITY_SCRUB ||
-			    pri == ZIO_PRIORITY_REBUILD)) ||
-			    ((nvlist_lookup_uint64(nvl,
-			    FM_EREPORT_PAYLOAD_ZFS_ZIO_FLAGS, &flags) == 0) &&
-			    (flags & (ZIO_FLAG_SCRUB | ZIO_FLAG_RESILVER))) ||
-			    ((nvlist_lookup_int32(nvl,
-			    FM_EREPORT_PAYLOAD_ZFS_ZIO_FLAGS, &flags32) == 0) &&
-			    (flags32 & (ZIO_FLAG_SCRUB | ZIO_FLAG_RESILVER)))) {
-				fmd_hdl_debug(hdl, "ignoring '%s' for "
-				    "scrub/resilver I/O", class);
-				return;
-			}
-
 			if (zcp->zc_data.zc_serd_checksum[0] == '\0') {
-				if (nvlist_lookup_uint64(nvl,
-				    FM_EREPORT_PAYLOAD_ZFS_VDEV_CKSUM_N,
-				    &checksum_n) != 0) {
-					checksum_n = DEFAULT_CHECKSUM_N;
-				}
-				if (nvlist_lookup_uint64(nvl,
-				    FM_EREPORT_PAYLOAD_ZFS_VDEV_CKSUM_T,
-				    &checksum_t) != 0) {
-					checksum_t = DEFAULT_CHECKSUM_T;
-				}
-
 				zfs_serd_name(zcp->zc_data.zc_serd_checksum,
 				    pool_guid, vdev_guid, "checksum");
 				fmd_serd_create(hdl,
 				    zcp->zc_data.zc_serd_checksum,
-				    checksum_n,
-				    SEC2NSEC(checksum_t));
-				zfs_case_serialize(zcp);
+				    fmd_prop_get_int32(hdl, "checksum_N"),
+				    fmd_prop_get_int64(hdl, "checksum_T"));
+				zfs_case_serialize(hdl, zcp);
 			}
-			if (zfs_fm_serd_record(hdl,
-			    zcp->zc_data.zc_serd_checksum, ep, zcp,
-			    "checksum")) {
+			if (fmd_serd_record(hdl,
+			    zcp->zc_data.zc_serd_checksum, ep)) {
 				zfs_case_solve(hdl, zcp,
-				    "fault.fs.zfs.vdev.checksum");
+				    "fault.fs.zfs.vdev.checksum", B_FALSE);
 			}
 		} else if (fmd_nvl_class_match(hdl, nvl,
 		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_IO_FAILURE)) &&
@@ -1025,11 +817,12 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 			if (strncmp(failmode, FM_EREPORT_FAILMODE_CONTINUE,
 			    strlen(FM_EREPORT_FAILMODE_CONTINUE)) == 0) {
 				zfs_case_solve(hdl, zcp,
-				    "fault.fs.zfs.io_failure_continue");
+				    "fault.fs.zfs.io_failure_continue",
+				    B_FALSE);
 			} else if (strncmp(failmode, FM_EREPORT_FAILMODE_WAIT,
 			    strlen(FM_EREPORT_FAILMODE_WAIT)) == 0) {
 				zfs_case_solve(hdl, zcp,
-				    "fault.fs.zfs.io_failure_wait");
+				    "fault.fs.zfs.io_failure_wait", B_FALSE);
 			}
 		} else if (fmd_nvl_class_match(hdl, nvl,
 		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_PROBE_FAILURE))) {
@@ -1051,7 +844,7 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 			    zfs_remove_timeout);
 			if (!zcp->zc_data.zc_has_remove_timer) {
 				zcp->zc_data.zc_has_remove_timer = 1;
-				zfs_case_serialize(zcp);
+				zfs_case_serialize(hdl, zcp);
 			}
 		}
 	}
@@ -1061,13 +854,14 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
  * The timeout is fired when we diagnosed an I/O error, and it was not due to
  * device removal (which would cause the timeout to be cancelled).
  */
+/* ARGSUSED */
 static void
 zfs_fm_timeout(fmd_hdl_t *hdl, id_t id, void *data)
 {
 	zfs_case_t *zcp = data;
 
 	if (id == zcp->zc_remove_timer)
-		zfs_case_solve(hdl, zcp, "fault.fs.zfs.vdev.io");
+		zfs_case_solve(hdl, zcp, "fault.fs.zfs.vdev.io", B_FALSE);
 }
 
 /*
@@ -1083,8 +877,6 @@ zfs_fm_close(fmd_hdl_t *hdl, fmd_case_t *cs)
 		fmd_serd_destroy(hdl, zcp->zc_data.zc_serd_checksum);
 	if (zcp->zc_data.zc_serd_io[0] != '\0')
 		fmd_serd_destroy(hdl, zcp->zc_data.zc_serd_io);
-	if (zcp->zc_data.zc_serd_slow_io[0] != '\0')
-		fmd_serd_destroy(hdl, zcp->zc_data.zc_serd_slow_io);
 	if (zcp->zc_data.zc_has_remove_timer)
 		fmd_timer_remove(hdl, zcp->zc_remove_timer);
 
@@ -1093,15 +885,30 @@ zfs_fm_close(fmd_hdl_t *hdl, fmd_case_t *cs)
 	fmd_hdl_free(hdl, zcp, sizeof (zfs_case_t));
 }
 
+/*
+ * We use the fmd gc entry point to look for old cases that no longer apply.
+ * This allows us to keep our set of case data small in a long running system.
+ */
+static void
+zfs_fm_gc(fmd_hdl_t *hdl)
+{
+	zfs_purge_cases(hdl);
+}
+
 static const fmd_hdl_ops_t fmd_ops = {
 	zfs_fm_recv,	/* fmdo_recv */
 	zfs_fm_timeout,	/* fmdo_timeout */
 	zfs_fm_close,	/* fmdo_close */
 	NULL,		/* fmdo_stats */
-	NULL,	/* fmdo_gc */
+	zfs_fm_gc,	/* fmdo_gc */
 };
 
 static const fmd_prop_t fmd_props[] = {
+	{ "checksum_N", FMD_TYPE_UINT32, "10" },
+	{ "checksum_T", FMD_TYPE_TIME, "10min" },
+	{ "io_N", FMD_TYPE_UINT32, "10" },
+	{ "io_T", FMD_TYPE_TIME, "10min" },
+	{ "remove_timeout", FMD_TYPE_TIME, "15sec" },
 	{ NULL, 0, NULL }
 };
 
@@ -1142,6 +949,8 @@ _zfs_diagnosis_init(fmd_hdl_t *hdl)
 
 	(void) fmd_stat_create(hdl, FMD_STAT_NOALLOC, sizeof (zfs_stats) /
 	    sizeof (fmd_stat_t), (fmd_stat_t *)&zfs_stats);
+
+	zfs_remove_timeout = fmd_prop_get_int64(hdl, "remove_timeout");
 }
 
 void

cmd/zed/agents/zfs_retire.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -7,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 https://opensource.org/licenses/CDDL-1.0.
+ * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
@@ -39,10 +38,8 @@
 #include <sys/fs/zfs.h>
 #include <sys/fm/protocol.h>
 #include <sys/fm/fs/zfs.h>
-#include <libzutil.h>
 #include <libzfs.h>
 #include <string.h>
-#include <libgen.h>
 
 #include "zfs_agents.h"
 #include "fmd_api.h"
@@ -77,8 +74,6 @@ typedef struct find_cbdata {
 	uint64_t	cb_guid;
 	zpool_handle_t	*cb_zhp;
 	nvlist_t	*cb_vdev;
-	uint64_t	cb_vdev_guid;
-	uint64_t	cb_num_spares;
 } find_cbdata_t;
 
 static int
@@ -144,64 +139,6 @@ find_vdev(libzfs_handle_t *zhdl, nvlist_t *nv, uint64_t search_guid)
 	return (NULL);
 }
 
-static int
-remove_spares(zpool_handle_t *zhp, void *data)
-{
-	nvlist_t *config, *nvroot;
-	nvlist_t **spares;
-	uint_t nspares;
-	char *devname;
-	find_cbdata_t *cbp = data;
-	uint64_t spareguid = 0;
-	vdev_stat_t *vs;
-	unsigned int c;
-
-	config = zpool_get_config(zhp, NULL);
-	if (nvlist_lookup_nvlist(config,
-	    ZPOOL_CONFIG_VDEV_TREE, &nvroot) != 0) {
-		zpool_close(zhp);
-		return (0);
-	}
-
-	if (nvlist_lookup_nvlist_array(nvroot, ZPOOL_CONFIG_SPARES,
-	    &spares, &nspares) != 0) {
-		zpool_close(zhp);
-		return (0);
-	}
-
-	for (int i = 0; i < nspares; i++) {
-		if (nvlist_lookup_uint64(spares[i], ZPOOL_CONFIG_GUID,
-		    &spareguid) == 0 && spareguid == cbp->cb_vdev_guid) {
-			devname = zpool_vdev_name(NULL, zhp, spares[i],
-			    B_FALSE);
-			nvlist_lookup_uint64_array(spares[i],
-			    ZPOOL_CONFIG_VDEV_STATS, (uint64_t **)&vs, &c);
-			if (vs->vs_state != VDEV_STATE_REMOVED &&
-			    zpool_vdev_remove_wanted(zhp, devname) == 0)
-				cbp->cb_num_spares++;
-			break;
-		}
-	}
-
-	zpool_close(zhp);
-	return (0);
-}
-
-/*
- * Given a vdev guid, find and remove all spares associated with it.
- */
-static int
-find_and_remove_spares(libzfs_handle_t *zhdl, uint64_t vdev_guid)
-{
-	find_cbdata_t cb;
-
-	cb.cb_num_spares = 0;
-	cb.cb_vdev_guid = vdev_guid;
-	zpool_iter(zhdl, remove_spares, &cb);
-
-	return (cb.cb_num_spares);
-}
-
 /*
  * Given a (pool, vdev) GUID pair, find the matching pool and vdev.
  */
@@ -282,31 +219,25 @@ replace_with_spare(fmd_hdl_t *hdl, zpool_handle_t *zhp, nvlist_t *vdev)
 	 * replace it.
 	 */
 	for (s = 0; s < nspares; s++) {
-		boolean_t rebuild = B_FALSE;
-		const char *spare_name, *type;
+		char *spare_name;
 
 		if (nvlist_lookup_string(spares[s], ZPOOL_CONFIG_PATH,
 		    &spare_name) != 0)
 			continue;
 
-		/* prefer sequential resilvering for distributed spares */
-		if ((nvlist_lookup_string(spares[s], ZPOOL_CONFIG_TYPE,
-		    &type) == 0) && strcmp(type, VDEV_TYPE_DRAID_SPARE) == 0)
-			rebuild = B_TRUE;
-
 		/* if set, add the "ashift" pool property to the spare nvlist */
 		if (source != ZPROP_SRC_DEFAULT)
 			(void) nvlist_add_uint64(spares[s],
 			    ZPOOL_CONFIG_ASHIFT, ashift);
 
 		(void) nvlist_add_nvlist_array(replacement,
-		    ZPOOL_CONFIG_CHILDREN, (const nvlist_t **)&spares[s], 1);
+		    ZPOOL_CONFIG_CHILDREN, &spares[s], 1);
 
 		fmd_hdl_debug(hdl, "zpool_vdev_replace '%s' with spare '%s'",
-		    dev_name, zfs_basename(spare_name));
+		    dev_name, basename(spare_name));
 
 		if (zpool_vdev_attach(zhp, dev_name, spare_name,
-		    replacement, B_TRUE, rebuild) == 0) {
+		    replacement, B_TRUE) == 0) {
 			free(dev_name);
 			nvlist_free(replacement);
 			return (B_TRUE);
@@ -324,6 +255,7 @@ replace_with_spare(fmd_hdl_t *hdl, zpool_handle_t *zhp, nvlist_t *vdev)
  * ASRU is now usable.  ZFS has found the device to be present and
  * functioning.
  */
+/*ARGSUSED*/
 static void
 zfs_vdev_repair(fmd_hdl_t *hdl, nvlist_t *nvl)
 {
@@ -362,11 +294,11 @@ zfs_vdev_repair(fmd_hdl_t *hdl, nvlist_t *nvl)
 	    vdev_guid, pool_guid);
 }
 
+/*ARGSUSED*/
 static void
 zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
     const char *class)
 {
-	(void) ep;
 	uint64_t pool_guid, vdev_guid;
 	zpool_handle_t *zhp;
 	nvlist_t *resource, *fault;
@@ -376,61 +308,30 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
 	libzfs_handle_t *zhdl = zdp->zrd_hdl;
 	boolean_t fault_device, degrade_device;
 	boolean_t is_repair;
-	boolean_t l2arc = B_FALSE;
-	boolean_t spare = B_FALSE;
-	const char *scheme;
+	char *scheme;
 	nvlist_t *vdev = NULL;
-	const char *uuid;
+	char *uuid;
 	int repair_done = 0;
 	boolean_t retire;
 	boolean_t is_disk;
 	vdev_aux_t aux;
 	uint64_t state = 0;
-	vdev_stat_t *vs;
-	unsigned int c;
 
 	fmd_hdl_debug(hdl, "zfs_retire_recv: '%s'", class);
 
-	(void) nvlist_lookup_uint64(nvl, FM_EREPORT_PAYLOAD_ZFS_VDEV_STATE,
-	    &state);
-
 	/*
 	 * If this is a resource notifying us of device removal then simply
 	 * check for an available spare and continue unless the device is a
 	 * l2arc vdev, in which case we just offline it.
 	 */
-	if (strcmp(class, "resource.fs.zfs.removed") == 0 ||
-	    (strcmp(class, "resource.fs.zfs.statechange") == 0 &&
-	    (state == VDEV_STATE_REMOVED || state == VDEV_STATE_FAULTED))) {
-		const char *devtype;
+	if (strcmp(class, "resource.fs.zfs.removed") == 0) {
+		char *devtype;
 		char *devname;
-		boolean_t skip_removal = B_FALSE;
-
-		if (nvlist_lookup_string(nvl, FM_EREPORT_PAYLOAD_ZFS_VDEV_TYPE,
-		    &devtype) == 0) {
-			if (strcmp(devtype, VDEV_TYPE_SPARE) == 0)
-				spare = B_TRUE;
-			else if (strcmp(devtype, VDEV_TYPE_L2CACHE) == 0)
-				l2arc = B_TRUE;
-		}
-
-		if (nvlist_lookup_uint64(nvl,
-		    FM_EREPORT_PAYLOAD_ZFS_VDEV_GUID, &vdev_guid) != 0)
-			return;
-
-		if (vdev_guid == 0) {
-			fmd_hdl_debug(hdl, "Got a zero GUID");
-			return;
-		}
-
-		if (spare) {
-			int nspares = find_and_remove_spares(zhdl, vdev_guid);
-			fmd_hdl_debug(hdl, "%d spares removed", nspares);
-			return;
-		}
 
 		if (nvlist_lookup_uint64(nvl, FM_EREPORT_PAYLOAD_ZFS_POOL_GUID,
-		    &pool_guid) != 0)
+		    &pool_guid) != 0 ||
+		    nvlist_lookup_uint64(nvl, FM_EREPORT_PAYLOAD_ZFS_VDEV_GUID,
+		    &vdev_guid) != 0)
 			return;
 
 		if ((zhp = find_by_guid(zhdl, pool_guid, vdev_guid,
@@ -439,42 +340,16 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
 
 		devname = zpool_vdev_name(NULL, zhp, vdev, B_FALSE);
 
-		nvlist_lookup_uint64_array(vdev, ZPOOL_CONFIG_VDEV_STATS,
-		    (uint64_t **)&vs, &c);
-
-		if (vs->vs_state == VDEV_STATE_OFFLINE)
-			return;
-
-		/*
-		 * If state removed is requested for already removed vdev,
-		 * its a loopback event from spa_async_remove(). Just
-		 * ignore it.
-		 */
-		if ((vs->vs_state == VDEV_STATE_REMOVED &&
-		    state == VDEV_STATE_REMOVED)) {
-			if (strcmp(class, "resource.fs.zfs.removed") == 0 &&
-			    nvlist_exists(nvl, "by_kernel")) {
-				skip_removal = B_TRUE;
-			} else {
-				return;
-			}
-		}
-
-		/* Remove the vdev since device is unplugged */
-		int remove_status = 0;
-		if (!skip_removal && (l2arc ||
-		    (strcmp(class, "resource.fs.zfs.removed") == 0))) {
-			remove_status = zpool_vdev_remove_wanted(zhp, devname);
-			fmd_hdl_debug(hdl, "zpool_vdev_remove_wanted '%s'"
-			    ", err:%d", devname, libzfs_errno(zhdl));
-		}
-
-		/* Replace the vdev with a spare if its not a l2arc */
-		if (!l2arc && !remove_status &&
-		    (!fmd_prop_get_int32(hdl, "spare_on_remove") ||
-		    replace_with_spare(hdl, zhp, vdev) == B_FALSE)) {
-			/* Could not handle with spare */
-			fmd_hdl_debug(hdl, "no spare for '%s'", devname);
+		/* Can't replace l2arc with a spare: offline the device */
+		if (nvlist_lookup_string(nvl, FM_EREPORT_PAYLOAD_ZFS_VDEV_TYPE,
+		    &devtype) == 0 && strcmp(devtype, VDEV_TYPE_L2CACHE) == 0) {
+			fmd_hdl_debug(hdl, "zpool_vdev_offline '%s'", devname);
+			zpool_vdev_offline(zhp, devname, B_TRUE);
+		} else if (!fmd_prop_get_int32(hdl, "spare_on_remove") ||
+		    replace_with_spare(hdl, zhp, vdev) == B_FALSE) {
+			/* Could not handle with spare: offline the device */
+			fmd_hdl_debug(hdl, "zpool_vdev_offline '%s'", devname);
+			zpool_vdev_offline(zhp, devname, B_TRUE);
 		}
 
 		free(devname);
@@ -486,11 +361,12 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
 		return;
 
 	/*
-	 * Note: on Linux statechange events are more than just
+	 * Note: on zfsonlinux statechange events are more than just
 	 * healthy ones so we need to confirm the actual state value.
 	 */
 	if (strcmp(class, "resource.fs.zfs.statechange") == 0 &&
-	    state == VDEV_STATE_HEALTHY) {
+	    nvlist_lookup_uint64(nvl, FM_EREPORT_PAYLOAD_ZFS_VDEV_STATE,
+	    &state) == 0 && state == VDEV_STATE_HEALTHY) {
 		zfs_vdev_repair(hdl, nvl);
 		return;
 	}
@@ -535,9 +411,6 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
 		} else if (fmd_nvl_class_match(hdl, fault,
 		    "fault.fs.zfs.vdev.checksum")) {
 			degrade_device = B_TRUE;
-		} else if (fmd_nvl_class_match(hdl, fault,
-		    "fault.fs.zfs.vdev.slow_io")) {
-			degrade_device = B_TRUE;
 		} else if (fmd_nvl_class_match(hdl, fault,
 		    "fault.fs.zfs.device")) {
 			fault_device = B_FALSE;
@@ -624,7 +497,6 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
 		 * Attempt to substitute a hot spare.
 		 */
 		(void) replace_with_spare(hdl, zhp, vdev);
-
 		zpool_close(zhp);
 	}
 

cmd/zed/zed.c

@@ -1,10 +1,9 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
- * This file is part of the ZFS Event Daemon (ZED).
- *
+ * This file is part of the ZFS Event Daemon (ZED)
+ * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>.
  * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
  * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
- * Refer to the OpenZFS git commit log for authoritative copyright attribution.
+ * Refer to the ZoL git commit log for authoritative copyright attribution.
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License Version 1.0 (CDDL-1.0).
@@ -37,7 +36,6 @@ static volatile sig_atomic_t _got_hup = 0;
 static void
 _exit_handler(int signum)
 {
-	(void) signum;
 	_got_exit = 1;
 }
 
@@ -47,7 +45,6 @@ _exit_handler(int signum)
 static void
 _hup_handler(int signum)
 {
-	(void) signum;
 	_got_hup = 1;
 }
 
@@ -63,8 +60,8 @@ _setup_sig_handlers(void)
 		zed_log_die("Failed to initialize sigset");
 
 	sa.sa_flags = SA_RESTART;
-
 	sa.sa_handler = SIG_IGN;
+
 	if (sigaction(SIGPIPE, &sa, NULL) < 0)
 		zed_log_die("Failed to ignore SIGPIPE");
 
@@ -78,10 +75,6 @@ _setup_sig_handlers(void)
 	sa.sa_handler = _hup_handler;
 	if (sigaction(SIGHUP, &sa, NULL) < 0)
 		zed_log_die("Failed to register SIGHUP handler");
-
-	(void) sigaddset(&sa.sa_mask, SIGCHLD);
-	if (pthread_sigmask(SIG_BLOCK, &sa.sa_mask, NULL) < 0)
-		zed_log_die("Failed to block SIGCHLD");
 }
 
 /*
@@ -219,20 +212,22 @@ _finish_daemonize(void)
 int
 main(int argc, char *argv[])
 {
-	struct zed_conf zcp;
+	struct zed_conf *zcp;
 	uint64_t saved_eid;
 	int64_t saved_etime[2];
 
 	zed_log_init(argv[0]);
 	zed_log_stderr_open(LOG_NOTICE);
-	zed_conf_init(&zcp);
-	zed_conf_parse_opts(&zcp, argc, argv);
-	if (zcp.do_verbose)
+	zcp = zed_conf_create();
+	zed_conf_parse_opts(zcp, argc, argv);
+	if (zcp->do_verbose)
 		zed_log_stderr_open(LOG_INFO);
 
 	if (geteuid() != 0)
 		zed_log_die("Must be run as root");
 
+	zed_conf_parse_file(zcp);
+
 	zed_file_close_from(STDERR_FILENO + 1);
 
 	(void) umask(0);
@@ -240,72 +235,47 @@ main(int argc, char *argv[])
 	if (chdir("/") < 0)
 		zed_log_die("Failed to change to root directory");
 
-	if (zed_conf_scan_dir(&zcp) < 0)
+	if (zed_conf_scan_dir(zcp) < 0)
 		exit(EXIT_FAILURE);
 
-	if (!zcp.do_foreground) {
+	if (!zcp->do_foreground) {
 		_start_daemonize();
 		zed_log_syslog_open(LOG_DAEMON);
 	}
 	_setup_sig_handlers();
 
-	if (zcp.do_memlock)
+	if (zcp->do_memlock)
 		_lock_memory();
 
-	if ((zed_conf_write_pid(&zcp) < 0) && (!zcp.do_force))
+	if ((zed_conf_write_pid(zcp) < 0) && (!zcp->do_force))
 		exit(EXIT_FAILURE);
 
-	if (!zcp.do_foreground)
+	if (!zcp->do_foreground)
 		_finish_daemonize();
 
 	zed_log_msg(LOG_NOTICE,
 	    "ZFS Event Daemon %s-%s (PID %d)",
 	    ZFS_META_VERSION, ZFS_META_RELEASE, (int)getpid());
 
-	if (zed_conf_open_state(&zcp) < 0)
+	if (zed_conf_open_state(zcp) < 0)
 		exit(EXIT_FAILURE);
 
-	if (zed_conf_read_state(&zcp, &saved_eid, saved_etime) < 0)
+	if (zed_conf_read_state(zcp, &saved_eid, saved_etime) < 0)
 		exit(EXIT_FAILURE);
 
-idle:
-	/*
-	 * If -I is specified, attempt to open /dev/zfs repeatedly until
-	 * successful.
-	 */
-	do {
-		if (!zed_event_init(&zcp))
-			break;
-		/* Wait for some time and try again. tunable? */
-		sleep(30);
-	} while (!_got_exit && zcp.do_idle);
-
-	if (_got_exit)
-		goto out;
-
-	zed_event_seek(&zcp, saved_eid, saved_etime);
+	zed_event_init(zcp);
+	zed_event_seek(zcp, saved_eid, saved_etime);
 
 	while (!_got_exit) {
-		int rv;
 		if (_got_hup) {
 			_got_hup = 0;
-			(void) zed_conf_scan_dir(&zcp);
+			(void) zed_conf_scan_dir(zcp);
 		}
-		rv = zed_event_service(&zcp);
-
-		/* ENODEV: When kernel module is unloaded (osx) */
-		if (rv != 0)
-			break;
+		zed_event_service(zcp);
 	}
-
 	zed_log_msg(LOG_NOTICE, "Exiting");
-	zed_event_fini(&zcp);
-
-	if (zcp.do_idle && !_got_exit)
-		goto idle;
-
-out:
-	zed_conf_destroy(&zcp);
+	zed_event_fini(zcp);
+	zed_conf_destroy(zcp);
 	zed_log_fini();
 	exit(EXIT_SUCCESS);
 }

cmd/zed/zed.d/Makefile.am

@@ -1,59 +0,0 @@
-zedconfdir = $(sysconfdir)/zfs/zed.d
-dist_zedconf_DATA = \
-	%D%/zed-functions.sh \
-	%D%/zed.rc
-
-zedexecdir = $(zfsexecdir)/zed.d
-
-dist_zedexec_SCRIPTS = \
-	%D%/all-debug.sh \
-	%D%/all-syslog.sh \
-	%D%/data-notify.sh \
-	%D%/deadman-slot_off.sh \
-	%D%/generic-notify.sh \
-	%D%/pool_import-led.sh \
-	%D%/resilver_finish-notify.sh \
-	%D%/resilver_finish-start-scrub.sh \
-	%D%/scrub_finish-notify.sh \
-	%D%/statechange-led.sh \
-	%D%/statechange-notify.sh \
-	%D%/statechange-slot_off.sh \
-	%D%/trim_finish-notify.sh \
-	%D%/vdev_attach-led.sh \
-	%D%/vdev_clear-led.sh
-
-nodist_zedexec_SCRIPTS = \
-	%D%/history_event-zfs-list-cacher.sh
-
-SUBSTFILES += $(nodist_zedexec_SCRIPTS)
-
-zedconfdefaults = \
-	all-syslog.sh \
-	data-notify.sh \
-	deadman-slot_off.sh \
-	history_event-zfs-list-cacher.sh \
-	pool_import-led.sh \
-	resilver_finish-notify.sh \
-	resilver_finish-start-scrub.sh \
-	scrub_finish-notify.sh \
-	statechange-led.sh \
-	statechange-notify.sh \
-	statechange-slot_off.sh \
-	vdev_attach-led.sh \
-	vdev_clear-led.sh
-
-dist_noinst_DATA += %D%/README
-
-INSTALL_DATA_HOOKS += zed-install-data-hook
-zed-install-data-hook:
-	$(MKDIR_P) "$(DESTDIR)$(zedconfdir)"
-	set -x; for f in $(zedconfdefaults); do \
-	  [ -f "$(DESTDIR)$(zedconfdir)/$${f}" ] ||\
-	    [ -L "$(DESTDIR)$(zedconfdir)/$${f}" ] || \
-	    $(LN_S) "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
-	done
-
-SHELLCHECKSCRIPTS += $(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)
-$(call SHELLCHECK_OPTS,$(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)): SHELLCHECK_SHELL = sh
-# False positive: 1>&"${ZED_FLOCK_FD}" looks suspiciously similar to a >&filename bash extension
-$(call SHELLCHECK_OPTS,$(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)): CHECKBASHISMS_IGNORE = -e 'should be >word 2>&1' -e '&"$${ZED_FLOCK_FD}"'

cmd/zed/zed.d/all-debug.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-# shellcheck disable=SC2154
 #
 # Log all environment variables to ZED_DEBUG_LOG.
 #
@@ -13,11 +12,15 @@
 
 zed_exit_if_ignoring_this_event
 
-zed_lock "${ZED_DEBUG_LOG}"
-{
-	env | sort
-	echo
-} 1>&"${ZED_FLOCK_FD}"
-zed_unlock "${ZED_DEBUG_LOG}"
+lockfile="$(basename -- "${ZED_DEBUG_LOG}").lock"
 
+umask 077
+zed_lock "${lockfile}"
+exec >> "${ZED_DEBUG_LOG}"
+
+printenv | sort
+echo
+
+exec >&-
+zed_unlock "${lockfile}"
 exit 0

cmd/zed/zed.d/all-syslog.sh

@@ -1,52 +1,14 @@
 #!/bin/sh
-# shellcheck disable=SC2154
-#
-# Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
-# Copyright (c) 2020 by Delphix. All rights reserved.
-#
-
 #
 # Log the zevent via syslog.
-#
 
 [ -f "${ZED_ZEDLET_DIR}/zed.rc" ] && . "${ZED_ZEDLET_DIR}/zed.rc"
 . "${ZED_ZEDLET_DIR}/zed-functions.sh"
 
 zed_exit_if_ignoring_this_event
 
-# build a string of name=value pairs for this event
-msg="eid=${ZEVENT_EID} class=${ZEVENT_SUBCLASS}"
-
-if [ "${ZED_SYSLOG_DISPLAY_GUIDS}" = "1" ]; then
-    [ -n "${ZEVENT_POOL_GUID}" ] && msg="${msg} pool_guid=${ZEVENT_POOL_GUID}"
-    [ -n "${ZEVENT_VDEV_GUID}" ] && msg="${msg} vdev_guid=${ZEVENT_VDEV_GUID}"
-else
-    [ -n "${ZEVENT_POOL}" ] && msg="${msg} pool='${ZEVENT_POOL}'"
-    [ -n "${ZEVENT_VDEV_PATH}" ] && msg="${msg} vdev=${ZEVENT_VDEV_PATH##*/}"
-fi
-
-# log pool state if state is anything other than 'ACTIVE'
-[ -n "${ZEVENT_POOL_STATE_STR}" ] && [ "$ZEVENT_POOL_STATE" -ne 0 ] && \
-    msg="${msg} pool_state=${ZEVENT_POOL_STATE_STR}"
-
-# Log the following payload nvpairs if they are present
-[ -n "${ZEVENT_VDEV_STATE_STR}" ]  && msg="${msg} vdev_state=${ZEVENT_VDEV_STATE_STR}"
-[ -n "${ZEVENT_CKSUM_ALGORITHM}" ] && msg="${msg} algorithm=${ZEVENT_CKSUM_ALGORITHM}"
-[ -n "${ZEVENT_ZIO_SIZE}" ]        && msg="${msg} size=${ZEVENT_ZIO_SIZE}"
-[ -n "${ZEVENT_ZIO_OFFSET}" ]      && msg="${msg} offset=${ZEVENT_ZIO_OFFSET}"
-[ -n "${ZEVENT_ZIO_PRIORITY}" ]    && msg="${msg} priority=${ZEVENT_ZIO_PRIORITY}"
-[ -n "${ZEVENT_ZIO_ERR}" ]         && msg="${msg} err=${ZEVENT_ZIO_ERR}"
-[ -n "${ZEVENT_ZIO_FLAGS}" ]       && msg="${msg} flags=$(printf '0x%x' "${ZEVENT_ZIO_FLAGS}")"
-
-# log delays that are >= 10 milisec
-[ -n "${ZEVENT_ZIO_DELAY}" ] && [ "$ZEVENT_ZIO_DELAY" -gt 10000000 ] && \
-    msg="${msg} delay=$((ZEVENT_ZIO_DELAY / 1000000))ms"
-
-# list the bookmark data together
-# shellcheck disable=SC2153
-[ -n "${ZEVENT_ZIO_OBJSET}" ] && \
-    msg="${msg} bookmark=${ZEVENT_ZIO_OBJSET}:${ZEVENT_ZIO_OBJECT}:${ZEVENT_ZIO_LEVEL}:${ZEVENT_ZIO_BLKID}"
-
-zed_log_msg "${msg}"
-
+zed_log_msg "eid=${ZEVENT_EID}" "class=${ZEVENT_SUBCLASS}" \
+    "${ZEVENT_POOL_GUID:+"pool_guid=${ZEVENT_POOL_GUID}"}" \
+    "${ZEVENT_VDEV_PATH:+"vdev_path=${ZEVENT_VDEV_PATH}"}" \
+    "${ZEVENT_VDEV_STATE_STR:+"vdev_state=${ZEVENT_VDEV_STATE_STR}"}"
 exit 0

cmd/zed/zed.d/data-notify.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-# shellcheck disable=SC2154
 #
 # Send notification in response to a DATA error.
 #
@@ -26,7 +25,7 @@ zed_rate_limit "${rate_limit_tag}" || exit 3
 
 umask 077
 note_subject="ZFS ${ZEVENT_SUBCLASS} error for ${ZEVENT_POOL} on $(hostname)"
-note_pathname="$(mktemp)"
+note_pathname="${TMPDIR:="/tmp"}/$(basename -- "$0").${ZEVENT_EID}.$$"
 {
     echo "ZFS has detected a data error:"
     echo

cmd/zed/zed.d/deadman-slot_off.sh

@@ -1,71 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC3014,SC2154,SC2086,SC2034
-#
-# Turn off disk's enclosure slot if an I/O is hung triggering the deadman.
-#
-# It's possible for outstanding I/O to a misbehaving SCSI disk to neither
-# promptly complete or return an error.  This can occur due to retry and
-# recovery actions taken by the SCSI layer, driver, or disk.  When it occurs
-# the pool will be unresponsive even though there may be sufficient redundancy
-# configured to proceeded without this single disk.
-#
-# When a hung I/O is detected by the kmods it will be posted as a deadman
-# event.  By default an I/O is considered to be hung after 5 minutes.  This
-# value can be changed with the zfs_deadman_ziotime_ms module parameter.
-# If ZED_POWER_OFF_ENCLOSURE_SLOT_ON_DEADMAN is set the disk's enclosure
-# slot will be powered off causing the outstanding I/O to fail.  The ZED
-# will then handle this like a normal disk failure and FAULT the vdev.
-#
-# We assume the user will be responsible for turning the slot back on
-# after replacing the disk.
-#
-# Note that this script requires that your enclosure be supported by the
-# Linux SCSI Enclosure services (SES) driver.  The script will do nothing
-# if you have no enclosure, or if your enclosure isn't supported.
-#
-# Exit codes:
-#   0: slot successfully powered off
-#   1: enclosure not available
-#   2: ZED_POWER_OFF_ENCLOSURE_SLOT_ON_DEADMAN disabled
-#   3: System not configured to wait on deadman
-#   4: The enclosure sysfs path passed from ZFS does not exist
-#   5: Enclosure slot didn't actually turn off after we told it to
-
-[ -f "${ZED_ZEDLET_DIR}/zed.rc" ] && . "${ZED_ZEDLET_DIR}/zed.rc"
-. "${ZED_ZEDLET_DIR}/zed-functions.sh"
-
-if [ ! -d /sys/class/enclosure ] ; then
-	# No JBOD enclosure or NVMe slots
-	exit 1
-fi
-
-if [ "${ZED_POWER_OFF_ENCLOSURE_SLOT_ON_DEADMAN}" != "1" ] ; then
-	exit 2
-fi
-
-if [ "$ZEVENT_POOL_FAILMODE" != "wait" ] ; then
-	exit 3
-fi
-
-if [ ! -f "$ZEVENT_VDEV_ENC_SYSFS_PATH/power_status" ] ; then
-	exit 4
-fi
-
-# Turn off the slot and wait for sysfs to report that the slot is off.
-# It can take ~400ms on some enclosures and multiple retries may be needed.
-for i in $(seq 1 20) ; do
-	echo "off" | tee "$ZEVENT_VDEV_ENC_SYSFS_PATH/power_status"
-
-	for j in $(seq 1 5) ; do
-		if [ "$(cat $ZEVENT_VDEV_ENC_SYSFS_PATH/power_status)" == "off" ] ; then
-			break 2
-		fi
-		sleep 0.1
-	done
-done
-
-if [ "$(cat $ZEVENT_VDEV_ENC_SYSFS_PATH/power_status)" != "off" ] ; then
-	exit 5
-fi
-
-zed_log_msg "powered down slot $ZEVENT_VDEV_ENC_SYSFS_PATH for $ZEVENT_VDEV_PATH"

cmd/zed/zed.d/generic-notify.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-# shellcheck disable=SC2154
 #
 # Send notification in response to a given zevent.
 #
@@ -24,7 +23,7 @@
 
 # Rate-limit the notification based in part on the filename.
 #
-rate_limit_tag="${ZEVENT_POOL};${ZEVENT_SUBCLASS};${0##*/}"
+rate_limit_tag="${ZEVENT_POOL};${ZEVENT_SUBCLASS};$(basename -- "$0")"
 rate_limit_interval="${ZED_NOTIFY_INTERVAL_SECS}"
 zed_rate_limit "${rate_limit_tag}" "${rate_limit_interval}" || exit 3
 
@@ -32,7 +31,7 @@ umask 077
 pool_str="${ZEVENT_POOL:+" for ${ZEVENT_POOL}"}"
 host_str=" on $(hostname)"
 note_subject="ZFS ${ZEVENT_SUBCLASS} event${pool_str}${host_str}"
-note_pathname="$(mktemp)"
+note_pathname="${TMPDIR:="/tmp"}/$(basename -- "$0").${ZEVENT_EID}.$$"
 {
     echo "ZFS has posted the following event:"
     echo

cmd/zed/zed.d/history_event-zfs-list-cacher.sh.in

@@ -1,11 +1,11 @@
 #!/bin/sh
-# shellcheck disable=SC2154
 #
 # Track changes to enumerated pools for use in early-boot
 set -ef
 
-FSLIST="@sysconfdir@/zfs/zfs-list.cache/${ZEVENT_POOL}"
-FSLIST_TMP="@runstatedir@/zfs-list.cache@${ZEVENT_POOL}"
+FSLIST_DIR="@sysconfdir@/zfs/zfs-list.cache"
+FSLIST_TMP="@runstatedir@/zfs-list.cache.new"
+FSLIST="${FSLIST_DIR}/${ZEVENT_POOL}"
 
 # If the pool specific cache file is not writeable, abort
 [ -w "${FSLIST}" ] || exit 0
@@ -13,21 +13,21 @@ FSLIST_TMP="@runstatedir@/zfs-list.cache@${ZEVENT_POOL}"
 [ -f "${ZED_ZEDLET_DIR}/zed.rc" ] && . "${ZED_ZEDLET_DIR}/zed.rc"
 . "${ZED_ZEDLET_DIR}/zed-functions.sh"
 
-[ "$ZEVENT_SUBCLASS" != "history_event" ] && exit 0
-zed_check_cmd "${ZFS}" sort diff
+zed_exit_if_ignoring_this_event
+zed_check_cmd "${ZFS}" sort diff grep
 
 # If we are acting on a snapshot, we have nothing to do
-[ "${ZEVENT_HISTORY_DSNAME%@*}" = "${ZEVENT_HISTORY_DSNAME}" ] || exit 0
+printf '%s' "${ZEVENT_HISTORY_DSNAME}" | grep '@' && exit 0
 
-# We lock the output file to avoid simultaneous writes.
+# We obtain a lock on zfs-list to avoid any simultaneous writes.
 # If we run into trouble, log and drop the lock
 abort_alter() {
-  zed_log_msg "Error updating zfs-list.cache for ${ZEVENT_POOL}!"
-  zed_unlock "${FSLIST}"
+  zed_log_msg "Error updating zfs-list.cache!"
+  zed_unlock zfs-list
 }
 
 finished() {
-  zed_unlock "${FSLIST}"
+  zed_unlock zfs-list
   trap - EXIT
   exit 0
 }
@@ -37,7 +37,7 @@ case "${ZEVENT_HISTORY_INTERNAL_NAME}" in
       ;;
 
     export)
-        zed_lock "${FSLIST}"
+        zed_lock zfs-list
         trap abort_alter EXIT
         echo > "${FSLIST}"
         finished
@@ -46,13 +46,8 @@ case "${ZEVENT_HISTORY_INTERNAL_NAME}" in
     set|inherit)
         # Only act if one of the tracked properties is altered.
         case "${ZEVENT_HISTORY_INTERNAL_STR%%=*}" in
-            canmount|mountpoint|atime|relatime|devices|exec|readonly| \
-              setuid|nbmand|encroot|keylocation|org.openzfs.systemd:requires| \
-              org.openzfs.systemd:requires-mounts-for| \
-              org.openzfs.systemd:before|org.openzfs.systemd:after| \
-              org.openzfs.systemd:wanted-by|org.openzfs.systemd:required-by| \
-              org.openzfs.systemd:nofail|org.openzfs.systemd:ignore \
-            ) ;;
+            canmount|mountpoint|atime|relatime|devices|exec| \
+                readonly|setuid|nbmand) ;;
             *) exit 0 ;;
         esac
       ;;
@@ -63,23 +58,19 @@ case "${ZEVENT_HISTORY_INTERNAL_NAME}" in
       ;;
 esac
 
-zed_lock "${FSLIST}"
+zed_lock zfs-list
 trap abort_alter EXIT
 
-PROPS="name,mountpoint,canmount,atime,relatime,devices,exec\
-,readonly,setuid,nbmand,encroot,keylocation\
-,org.openzfs.systemd:requires,org.openzfs.systemd:requires-mounts-for\
-,org.openzfs.systemd:before,org.openzfs.systemd:after\
-,org.openzfs.systemd:wanted-by,org.openzfs.systemd:required-by\
-,org.openzfs.systemd:nofail,org.openzfs.systemd:ignore"
+PROPS="name,mountpoint,canmount,atime,relatime,devices,exec,readonly"
+PROPS="${PROPS},setuid,nbmand"
 
-"${ZFS}" list -H -t filesystem -o "${PROPS}" -r "${ZEVENT_POOL}" > "${FSLIST_TMP}"
+"${ZFS}" list -H -t filesystem -o $PROPS -r "${ZEVENT_POOL}" > "${FSLIST_TMP}"
 
 # Sort the output so that it is stable
 sort "${FSLIST_TMP}" -o "${FSLIST_TMP}"
 
 # Don't modify the file if it hasn't changed
-diff -q "${FSLIST_TMP}" "${FSLIST}" || cat "${FSLIST_TMP}" > "${FSLIST}"
+diff -q "${FSLIST_TMP}" "${FSLIST}" || mv "${FSLIST_TMP}" "${FSLIST}"
 rm -f "${FSLIST_TMP}"
 
 finished