mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-31 19:24:09 +03:00
Trim excess shellcheck annotations. Widen to all non-Korn scripts
Before, make shellcheck checked
scripts/{commitcheck,make_gitrev,man-dates,paxcheck,zfs-helpers,zfs,
zfs-tests,zimport,zloop}.sh
cmd/zed/zed.d/{{all-debug,all-syslog,data-notify,generic-notify,
resilver_finish-start-scrub,scrub_finish-notify,
statechange-led,statechange-notify,trim_finish-notify,
zed-functions}.sh,history_event-zfs-list-cacher.sh.in}
cmd/zpool/zpool.d/{dm-deps,iostat,lsblk,media,ses,smart,upath}
now it also checks
contrib/dracut/{02zfsexpandknowledge/module-setup,
90zfs/{export-zfs,parse-zfs,zfs-needshutdown,
zfs-load-key,zfs-lib,module-setup,
mount-zfs,zfs-generator}}.sh.in
cmd/zed/zed.d/{pool_import-led,vdev_attach-led,
resilver_finish-notify,vdev_clear-led}.sh
contrib/initramfs/{zfsunlock,hooks/zfs.in,scripts/local-top/zfs}
tests/zfs-tests/tests/perf/scripts/prefetch_io.sh
scripts/common.sh.in
contrib/bpftrace/zfs-trace.sh
autogen.sh
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12042
This commit is contained in:
@@ -14,21 +14,16 @@ get_pool_devices() {
|
||||
local poolconfigtemp
|
||||
local poolconfigoutput
|
||||
local pooldev
|
||||
local prefix
|
||||
local resolved
|
||||
poolconfigtemp=`mktemp`
|
||||
poolconfigtemp="$(mktemp)"
|
||||
if ! @sbindir@/zpool list -v -H -P "$1" > "$poolconfigtemp" 2>&1 ; then
|
||||
poolconfigoutput=$(cat "$poolconfigtemp")
|
||||
poolconfigoutput="$(cat "$poolconfigtemp")"
|
||||
dinfo "zfsexpandknowledge: pool $1 cannot be listed: $poolconfigoutput"
|
||||
else
|
||||
cat "$poolconfigtemp" | awk -F '\t' '/\t\/dev/ { print $2 }' | \
|
||||
while read pooldev ; do
|
||||
if [ -n "$pooldev" -a -e "$pooldev" ] ; then
|
||||
if [ -h "$pooldev" ] ; then
|
||||
resolved=`readlink -f "$pooldev"`
|
||||
else
|
||||
resolved="$pooldev"
|
||||
fi
|
||||
awk -F '\t' '/\t\/dev/ { print $2 }' "$poolconfigtemp" | \
|
||||
while read -r pooldev ; do
|
||||
if [ -e "$pooldev" ] ; then
|
||||
resolved="$(readlink -f "$pooldev")"
|
||||
dinfo "zfsexpandknowledge: pool $1 has device $pooldev (which resolves to $resolved)"
|
||||
echo "$resolved"
|
||||
fi
|
||||
@@ -39,22 +34,20 @@ get_pool_devices() {
|
||||
|
||||
find_zfs_block_devices() {
|
||||
local dev
|
||||
local blockdev
|
||||
local mp
|
||||
local fstype
|
||||
local pool
|
||||
local key
|
||||
local n
|
||||
local poolconfigoutput
|
||||
numfields=`head -1 /proc/self/mountinfo | awk '{print NF}'`
|
||||
if [ "$numfields" == "10" ] ; then
|
||||
fields="n n n n mp n n fstype dev n"
|
||||
local _
|
||||
numfields="$(awk '{print NF; exit}' /proc/self/mountinfo)"
|
||||
if [ "$numfields" = "10" ] ; then
|
||||
fields="_ _ _ _ mp _ _ fstype dev _"
|
||||
else
|
||||
fields="n n n n mp n n n fstype dev n"
|
||||
fields="_ _ _ _ mp _ _ _ fstype dev _"
|
||||
fi
|
||||
while read $fields ; do
|
||||
if [ "$fstype" != "zfs" ]; then continue ; fi
|
||||
if [ "$mp" == "$1" ]; then
|
||||
# shellcheck disable=SC2086
|
||||
while read -r ${fields?} ; do
|
||||
[ "$fstype" = "zfs" ] || continue
|
||||
if [ "$mp" = "$1" ]; then
|
||||
pool=$(echo "$dev" | cut -d / -f 1)
|
||||
get_pool_devices "$pool"
|
||||
fi
|
||||
@@ -76,10 +69,9 @@ check() {
|
||||
local _depdev
|
||||
local _depdevname
|
||||
local _depdevtype
|
||||
local _depmajmin
|
||||
local _dev
|
||||
|
||||
if [[ $hostonly ]]; then
|
||||
# shellcheck disable=SC2154
|
||||
if [ -n "$hostonly" ]; then
|
||||
|
||||
for mp in \
|
||||
"/" \
|
||||
@@ -106,13 +98,12 @@ if [[ $hostonly ]]; then
|
||||
fstype=$(get_devtype "$dev")
|
||||
host_fs_types["$dev"]="$fstype"
|
||||
majmin=$(get_maj_min "$dev")
|
||||
if [[ -d /sys/dev/block/$majmin/slaves ]] ; then
|
||||
for _depdev in /sys/dev/block/$majmin/slaves/*; do
|
||||
if [ -d "/sys/dev/block/$majmin/slaves" ] ; then
|
||||
for _depdev in "/sys/dev/block/$majmin/slaves"/*; do
|
||||
[[ -f $_depdev/dev ]] || continue
|
||||
_depdev=/dev/$(basename "$_depdev")
|
||||
_depdevname=$(udevadm info --query=property --name="$_depdev" | grep "^DEVNAME=" | sed 's|^DEVNAME=||')
|
||||
_depdevtype=$(get_devtype "$_depdevname")
|
||||
_depmajmin=$(get_maj_min "$_depdevname")
|
||||
dinfo "zfsexpandknowledge: underlying block device backing ZFS dataset $mp: ${_depdevname//$'\n'/ }"
|
||||
array_contains "$_depdevname" "${host_devs[@]}" || host_devs+=("$_depdevname")
|
||||
host_fs_types["$_depdevname"]="$_depdevtype"
|
||||
|
||||
Reference in New Issue
Block a user