BSD Commit Log Search

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master

zfs: merge openzfs/zfs at e25f9131d (zfs-2.1-release) into stable/13

OpenZFS release 2.1.11

Notable upstream pull requeset merges:
  #13368 ZFS_IOC_COUNT_FILLED does unnecessary txg_wait_synced() (reverted)
  #13758 Allow mounting snapshots in .zfs/snapshot as a regular user
  #13816 Fix a race condition in dsl_dataset_sync() when activating features
  #14039 Optimize microzaps
  #14196 Remove atomics from zh_refcount
  #14198 Switch dnode stats to wmsums
  #14199 Remove few pointer dereferences in dbuf_read()
  #14200 Micro-optimize zrl_remove()
  #14218 Avoid a null pointer dereference in zfs_mount() on FreeBSD
  #14293 Turn default_bs and default_ibs into ZFS_MODULE_PARAMs
  #14317 Pack zrlock_t by 8 bytes
  #14402 Prefetch on deadlists merge
  #14418 Introduce minimal ZIL block commit delay
  #14448 Fix console progress reporting for recursive send

    [18 lines not shown]

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master

zfs: merge openzfs/zfs at 21bd76613 (zfs-2.1-release) into stable/13

OpenZFS release 2.1.7

Notable upstream pull requeset merges:
  #13680 Add options to zfs redundant_metadata property
  #13782 Fix setting the large_block feature after receiving a snapshot
  #13839 quota: extend quota for dataset
  #13938 Bring per_txg_dirty_frees_percent back to 30
  #13939 Fix panic in dsl_process_sub_livelist for EINTR
  #13973 Fix memory leaks in dmu_send()/dmu_send_obj()
  #13978 PAM: Fix unchecked return value from zfs_key_config_load()
  #13998 zvol_wait logic may terminate prematurely
  #14001 FreeBSD: Fix a pair of bugs in zfs_fhtovp()
  #14003 Stop ganging due to past vdev write errors
  #14050 Fix draid2+2s metadata error on simultaneous 2 drive failures
  #14062 zed: Avoid core dump if wholedisk property does not exist
  #14077 Propagate extent_bytes change to autotrim thread
  #14079 FreeBSD: vn_flush_cached_data: observe vnode locking contract

    [15 lines not shown]

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)

Merge branch 'freebsd/current/main' into hardened/current/master

zfs: merge openzfs/zfs at c0cf6ed67

Notable upstream pull request merges:
  #10662 zvol_wait: Ignore locked zvols
  #12789 Improve log spacemap load time
  #12812 Improved zpool status output, list all affected datasets
  #13277 FreeBSD: Use NDFREE_PNBUF if available
  #13302 Make zfs_max_recordsize default to 16M
  #13311 Fix error handling in FreeBSD's get/putpages VOPs
  #13345 FreeBSD: Fix translation from ABD to physical pages
  #13373 zfs: holds: dequadratify
  #13375 Corrected edge case in uncompressed ARC->L2ARC handling
  #13388 Improve mg_aliquot math
  #13405 Reduce dbuf_find() lock contention
  #13406 FreeBSD: use zero_region instead of allocating a dedicated page

Obtained from:  OpenZFS
OpenZFS commit: c0cf6ed6792e545fd614c2a88cb53756db7e03f8

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master

Conflicts:
        release/rc.local (unresolved)
        usr.sbin/bsdinstall/scripts/fetchmissingdists (unresolved)
        usr.sbin/bsdinstall/scripts/mount (unresolved)

zfs: merge openzfs/zfs at bc3f12bfa (master) into main

Notable upstream pull request merges:
  #12083 libzfs: FreeBSD doesn't resize partitions for you
  #13106 add physical device size to SIZE column in 'zpool list -v'
  #13158 Allow zfs send to exclude datasets
  #13190 module: zfs: zio_inject: zio_match_handler: don't << -1
  #13219 FreeBSD: add missing replay check to an assert in zfs_xvattr_set
  #13220 module: freebsd: avoid a taking a destroyed lock in zfs_zevent bits
  #13221 Fix ACL checks for NFS kernel server

Obtained from:  OpenZFS
OpenZFS commit: bc3f12bfac152a0c28951cec92340ba14f9ccee9

Merge branch 'freebsd/current/main' into hardened/current/master

zfs: merge openzfs/zfs at a86e08941 (master) into main

Notable upstream pull request merges:
  #9078:  log xattr=sa create/remove/update to ZIL
  #11919: Cross-platform xattr user namespace compatibility
  #13014: Report dnodes with faulty bonuslen
  #13016: FreeBSD: Fix zvol_cdev_open locking
  #13019: spl: Don't check FreeBSD rwlocks for double initialization
  #13027: Fix clearing set-uid and set-gid bits on a file when
          replying a write
  #13031: Add enumerated vdev names to 'zpool iostat -v' and
          'zpool list -v'
  #13074: Enable encrypted raw sending to pools with greater ashift
  #13076: Receive checks should allow unencrypted child datasets
  #13098: Avoid dirtying the final TXGs when exporting a pool
  #13172: Fix ENOSPC when unlinking multiple files from full pool

Obtained from:  OpenZFS
OpenZFS commit: a86e089415679cf1b98eb424a159bb36aa2c19e3

Merge branch 'freebsd/current/main' into hardened/current/master

zfs: merge openzfs/zfs at 17b2ae0b2 (master) into main

Notable upstream pull request merges:
  #12766 Fix error propagation from lzc_send_redacted
  #12805 Updated the lz4 decompressor
  #12851 FreeBSD: Provide correct file generation number
  #12857 Verify dRAID empty sectors
  #12874 FreeBSD: Update argument types for VOP_READDIR
  #12896 Reduce number of arc_prune threads
  #12934 FreeBSD: Fix zvol_*_open() locking
  #12947 lz4: Cherrypick fix for CVE-2021-3520
  #12961 FreeBSD: Fix leaked strings in libspl mnttab
  #12964 Fix handling of errors from dmu_write_uio_dbuf() on FreeBSD
  #12981 Introduce a flag to skip comparing the local mac when raw sending
  #12985 Avoid memory allocations in the ARC eviction thread

Obtained from:  OpenZFS
OpenZFS commit: 17b2ae0b24d487fdda2ef1098ec26fa7f79a61f6

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
        usr.sbin/hbsd-update/hbsd-update.conf (unresolved)

Merge branch 'hardened/current/master' into hardened/current/sensitive

Merge branch 'freebsd/current/main' into hardened/current/master

zfs: merge openzfs/zfs at f291fa658 (master) into main

Notable upstream pull request merges:
  #11711 Vdev Properties Feature
  #12717 VOP_RENAME fixes for FreeBSD
  #12746 Enable strict hole reporting by default
  #12770 ZFS send/recv with ashift 9->12 leads to data corruption
  #12828 FreeBSD: Add vop_standard_writecount_nomsyn
  #12828 zfs: Fix a deadlock between page busy and the teardown lock
  #12828 FreeBSD: Catch up with more VFS changes

Obtained from:  OpenZFS
OpenZFS commit: f291fa658efd146540b03ce386133632bde237bf

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        libexec/rtld-elf/Makefile (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        targets/pseudo/bootstrap-tools/Makefile (unresolved)

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
        share/mk/bsd.opts.mk (unresolved)

zfs: merge openzfs/zfs at f3678d70f (master) into main

Notable upstream pull request merges:
  #12339 Read past end of argv array in zpool_do_import()
  #12365 Fixes in persistent L2ARC
  #12383 Fixes for KMSAN reports
  #12425 Avoid small buffer copying on write
  #12428 Fix unfortunate NULL in spa_update_dspace
  #12446 Allow disabling of unmapped I/O on FreeBSD

Obtained from:  OpenZFS
OpenZFS commit: f3678d70ff8f98d67caf377ec0326c9a6c7bcf29

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)

Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master

* freebsd/13-stable/main:
  Update cache file when setting compatibility property
  Fix flag copying in resume case
  zfs_metaslab_mem_limit should be 25 instead of 75
  Stop using "zstreamdump" in tests/
  Update libera webchat client URL
  gcc 11 cleanup
  ZTS: Add known exceptions
  Annotated dprintf as printf-like
  Revert Consolidate arc_buf allocation checks
  Use wmsum for arc, abd, dbuf and zfetch statistics. (#12172)

zfs: merge openzfs/zfs at aee26af27 (zfs-2.1-release) into stable/13

Notable upstream pull request merges:
  #12172 Use wmsum for arc, abd, dbuf and zfetch statistics
  #12227 Revert Consolidate arc_buf allocation checks
  #12273 zfs_metaslab_mem_limit should be 25 instead of 75
  #12266 Fix flag copying in resume case
  #12276 Update cache file when setting compatibility property

Obtained from:  OpenZFS
OpenZFS commit: aee26af277c91abeb0e1cfe27cc48cc328fdb881

Merge branch 'freebsd/current/main' into hardened/current/master

* freebsd/current/main:
  fusefs: correctly set lock owner during FUSE_SETLK
  Add support for link status, media and VLAN MTU (if supported) to if_cdce...
  Help compiller optimize out abd_verify()
  cxgbe(4): Do not configure traffic classes automatically on attach.
  cxgbe(4): Get the number of usable traffic classes from the firmware.
  Update to bmake-20210621
  Import bmake-20210621
  FreeBSD: fix compilation of FreeBSD world after 29274c9f6
  Update cache file when setting compatibility property
  Fix flag copying in resume case
  zfs_metaslab_mem_limit should be 25 instead of 75
  Stop using "zstreamdump" in tests/
  Update libera webchat client URL
  gcc 11 cleanup
  ZTS: Add known exceptions
  Annotated dprintf as printf-like

    [3 lines not shown]

zfs: merge openzfs/zfs at 5e2c8338b (master) into main

Notable upstream pull request merges:
  #12183 Optimize small random numbers generation
  #12227 Revert Consolidate arc_buf allocation checks
  #12266 Fix flag copying in resume case
  #12273 zfs_metaslab_mem_limit should be 25 instead of 75
  #12276 Update cache file when setting compatibility property
  #12280 Help compiller optimize out abd_verify()
  #12282 FreeBSD: fix compilation of FreeBSD world after 29274c9f6

Obtained from:  OpenZFS
OpenZFS commit: 5e2c8338bf17d31b44eb1dbbb3c9b6a0f64e96ee

Merge remote-tracking branch 'origin/freebsd/13-stable/main' into hardened/13-stable/master

Conflicts:
        sys/i386/linux/linux_sysvec.c (unresolved)

zfs: merge openzfs/zfs at c3b60eded (zfs-2.1-release) into stable/13

Notable upstream pull request merges:
  #12015 Replace zstreamdump with zstream link
  #12046 Improve scrub maxinflight_bytes math.
  #12052 FreeBSD: incorporate changes to the VFS_QUOTACTL(9) KPI
  #12072 Let zfs diff be more permissive
  #12091 libzfs: On FreeBSD, use MNT_NOWAIT with getfsstat
  #12104 Reminder to update boot code after zpool upgrade
  #12114 Introduce write-mostly sums
  #12125 Modernise all (most) remaining .TH manpages
  #12145 More aggsum optimizations
  #12149 Multiple man-pages: Move to appropriate section
  #12158 Re-embed multilist_t storage
  #12177 Livelist logic should handle dedup blkptrs
  #12196 Unify manpage makefiles, move pages to better sexions, revisit some
  #12212 Remove pool io kstats

Obtained from:  OpenZFS

    [2 lines not shown]

Merge remote-tracking branch 'origin/freebsd/current/main' into hardened/current/master

Conflicts:
        sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c (unresolved)

Merge branch 'freebsd/13-stable/main' into hardened/13-stable/master

* freebsd/13-stable/main: (6768 commits)
  amd64: Clear the local TSS when creating a new thread
  i386: Make setidt_disp a size_t instead of uintptr_t
  pf: Avoid leaking pad bytes in struct pfr_astats when copying out
  ng_parse: IP address parsing in netgraph eating too many characters
  Tag 2.1.0-rc6
  RPM: Explicitly set the required min/max kernel version for the DKMS package
  Minor fix to configure on s390x
  Bend zpl_set_acl to permit the new userns* parameter
  Reinstate the old zpool read label logic as a fallback
  mount.zfs.8: match to reality; zfsprops.8: add missing temporary options
  mount.zfs.8: modernise
  zfsprops.8: remove nbmand-not-used-on-Linux and pointer to mount(8)
  Various Linux kABI cosmetics
  linux: don't fall through to 3-arg vfs_getattr
  FreeBSD: Update dataset_kstats for zvols in dev mode
  Correct flaws in arc_summary[23] and their test.

    [5 lines not shown]