diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-12-15 13:17:23 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-12-15 13:18:07 +0000 |
| commit | 5fb307d29b364982acbde82cbf77db3cae486f8c (patch) | |
| tree | c88ea4fda58b14ab37ae6140ccb7135bf152ac55 /sys/contrib/openzfs/cmd | |
| parent | c2e340452c147b551180f2a1600ae76491342b0e (diff) | |
| parent | 86e115e21e5bdeee73c88c5a1a73a29d9637380a (diff) | |
zfs: merge openzfs/zfs@86e115e21
Notable upstream pull request merges:
#15643 a9b937e06 For db_marker inherit the db pointer for AVL comparision
#15644 e53e60c0b DMU: Fix lock leak on dbuf_hold() error
#15653 86063d903 dbuf: Handle arcbuf assignment after block cloning
#15656 86e115e21 dbuf: Set dr_data when unoverriding after clone
Obtained from: OpenZFS
OpenZFS commit: 86e115e21e5bdeee73c88c5a1a73a29d9637380a
Diffstat (limited to 'sys/contrib/openzfs/cmd')
| -rwxr-xr-x | sys/contrib/openzfs/cmd/zed/zed.d/statechange-slot_off.sh | 6 | ||||
| -rw-r--r-- | sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/contrib/openzfs/cmd/zed/zed.d/statechange-slot_off.sh b/sys/contrib/openzfs/cmd/zed/zed.d/statechange-slot_off.sh index 150012abe71a..06acce93b8aa 100755 --- a/sys/contrib/openzfs/cmd/zed/zed.d/statechange-slot_off.sh +++ b/sys/contrib/openzfs/cmd/zed/zed.d/statechange-slot_off.sh @@ -5,7 +5,7 @@ # # Bad SCSI disks can often "disappear and reappear" causing all sorts of chaos # as they flip between FAULTED and ONLINE. If -# ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT is set in zed.rc, and the disk gets +# ZED_POWER_OFF_ENCLOSURE_SLOT_ON_FAULT is set in zed.rc, and the disk gets # FAULTED, then power down the slot via sysfs: # # /sys/class/enclosure/<enclosure>/<slot>/power_status @@ -19,7 +19,7 @@ # Exit codes: # 0: slot successfully powered off # 1: enclosure not available -# 2: ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT disabled +# 2: ZED_POWER_OFF_ENCLOSURE_SLOT_ON_FAULT disabled # 3: vdev was not FAULTED # 4: The enclosure sysfs path passed from ZFS does not exist # 5: Enclosure slot didn't actually turn off after we told it to @@ -32,7 +32,7 @@ if [ ! -d /sys/class/enclosure ] ; then exit 1 fi -if [ "${ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT}" != "1" ] ; then +if [ "${ZED_POWER_OFF_ENCLOSURE_SLOT_ON_FAULT}" != "1" ] ; then exit 2 fi diff --git a/sys/contrib/openzfs/cmd/zed/zed.d/zed.rc b/sys/contrib/openzfs/cmd/zed/zed.d/zed.rc index acdfabc8ded2..bc269b155d76 100644 --- a/sys/contrib/openzfs/cmd/zed/zed.d/zed.rc +++ b/sys/contrib/openzfs/cmd/zed/zed.d/zed.rc @@ -146,7 +146,7 @@ ZED_SYSLOG_SUBCLASS_EXCLUDE="history_event" # Power off the drive's slot in the enclosure if it becomes FAULTED. This can # help silence misbehaving drives. This assumes your drive enclosure fully # supports slot power control via sysfs. -#ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT=1 +#ZED_POWER_OFF_ENCLOSURE_SLOT_ON_FAULT=1 ## # Ntfy topic |