git: 0d8fe2373503 - main - zfs: merge openzfs/zfs at c4c162c1e (master) into main

[Martin Matuska]

The branch main has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=0d8fe2373503aeac48492f28073049a8bfa4feb5

commit 0d8fe2373503aeac48492f28073049a8bfa4feb5
Merge: 5403f2c163f7 c4c162c1e8ff
Author:     Martin Matuska <mm at FreeBSD.org>
AuthorDate: 2021-06-20 07:18:44 +0000
Commit:     Martin Matuska <mm at FreeBSD.org>
CommitDate: 2021-06-20 07:18:44 +0000

    zfs: merge openzfs/zfs at c4c162c1e (master) into main
    
    Notable upstream pull request merges:
      #12054 Avoid deadlock when removing L2ARC devices under I/O
      #12172 Use wmsum for arc, abd, dbuf and zfetch statistics
      #12221 vdev_draid_min_asize() ignores reserved space
    
    Obtained from:  OpenZFS
    OpenZFS commit: c4c162c1e8ff9ce8833014711875d18df520096c

 .../etc/systemd/system/zfs-import-cache.service.in |   2 +-
 .../etc/systemd/system/zfs-import-scan.service.in  |   2 +-
 sys/contrib/openzfs/include/sys/abd_impl.h         |   4 +-
 sys/contrib/openzfs/include/sys/arc_impl.h         | 119 +++-
 sys/contrib/openzfs/lib/libzutil/zutil_import.c    |   1 +
 sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c |  46 ++
 sys/contrib/openzfs/module/os/linux/zfs/abd_os.c   |  75 +++
 sys/contrib/openzfs/module/os/linux/zfs/arc_os.c   |   2 +-
 sys/contrib/openzfs/module/zfs/arc.c               | 606 +++++++++++++++------
 sys/contrib/openzfs/module/zfs/dbuf.c              | 112 +++-
 sys/contrib/openzfs/module/zfs/dmu_zfetch.c        |  47 +-
 sys/contrib/openzfs/module/zfs/vdev_draid.c        |   3 +-
 sys/contrib/openzfs/module/zfs/zio.c               |   3 -
 13 files changed, 789 insertions(+), 233 deletions(-)