Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of #13219 and #13220 to the staging branch #13233

Merged
merged 2 commits into from
Mar 19, 2022

Commits on Mar 18, 2022

  1. FreeBSD: add missing replay check to an assert in zfs_xvattr_set

    Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
    Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
    Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
    Closes openzfs#13219
    mjguzik authored and usaleem-ix committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    b7cbb2f View commit details
    Browse the repository at this point in the history
  2. module: freebsd: avoid a taking a destroyed lock in zfs_zevent bits

    At shutdown time, we drain all of the zevents and set the
    ZEVENT_SHUTDOWN flag.  On FreeBSD, we may end up calling
    zfs_zevent_destroy() after the zevent_lock has been destroyed while
    the sysevent thread is winding down; we observe ESHUTDOWN, then back
    out.
    
    Events have already been drained, so just inline the kmem_free call in
    sysevent_worker() to avoid the race, and document the assumption that
    zfs_zevent_destroy doesn't do anything else useful at that point.
    
    This fixes a panic that can occur at module unload time.
    
    Reviewed-by: Ryan Moeller <freqlabs@FreeBSD.org>
    Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
    Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
    Closes openzfs#13220
    kevans91 authored and usaleem-ix committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    0c27978 View commit details
    Browse the repository at this point in the history