diff options
| author | Matthew Ahrens <[email protected]> | 2020-06-10 17:07:59 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-06-10 17:07:59 -0700 |
| commit | f66434268cef381b2799c45c654162bfb8e128ce (patch) | |
| tree | ad43282f17f4f5314fad99f4da1bb2ead5211fe3 /tests/zfs-tests/include | |
| parent | feff3f69fc3de99f31af6955e2cb27eb8d0f436e (diff) | |
Remove unnecessary references to slavery
The horrible effects of human slavery continue to impact society. The
casual use of the term "slave" in computer software is an unnecessary
reference to a painful human experience.
This commit removes all possible references to the term "slave".
Implementation notes:
The zpool.d/slaves script is renamed to dm-deps, which uses the same
terminology as `dmsetup deps`.
References to the `/sys/class/block/$dev/slaves` directory remain. This
directory name is determined by the Linux kernel. Although
`dmsetup deps` provides the same information, it unfortunately requires
elevated privileges, whereas the `/sys/...` directory is world-readable.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Matthew Ahrens <[email protected]>
Closes #10435
Diffstat (limited to 'tests/zfs-tests/include')
| -rw-r--r-- | tests/zfs-tests/include/blkdev.shlib | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/zfs-tests/include/blkdev.shlib b/tests/zfs-tests/include/blkdev.shlib index 93334e4b4..5fda6a1bd 100644 --- a/tests/zfs-tests/include/blkdev.shlib +++ b/tests/zfs-tests/include/blkdev.shlib @@ -336,25 +336,25 @@ function on_off_disk # disk state{online,offline} host if [[ $state == "offline" ]] && ( is_mpath_device $disk ); then dm_name="$(readlink $DEV_DSKDIR/$disk \ | nawk -F / '{print $2}')" - slave="$(ls /sys/block/${dm_name}/slaves \ + dep="$(ls /sys/block/${dm_name}/slaves \ | nawk '{print $1}')" - while [[ -n $slave ]]; do + while [[ -n $dep ]]; do #check if disk is online - lsscsi | egrep $slave > /dev/null + lsscsi | egrep $dep > /dev/null if (($? == 0)); then - slave_dir="/sys/block/${dm_name}" - slave_dir+="/slaves/${slave}/device" - ss="${slave_dir}/state" - sd="${slave_dir}/delete" + dep_dir="/sys/block/${dm_name}" + dep_dir+="/slaves/${dep}/device" + ss="${dep_dir}/state" + sd="${dep_dir}/delete" log_must eval "echo 'offline' > ${ss}" log_must eval "echo '1' > ${sd}" - lsscsi | egrep $slave > /dev/null + lsscsi | egrep $dep > /dev/null if (($? == 0)); then log_fail "Offlining" \ "$disk failed" fi fi - slave="$(ls /sys/block/$dm_name/slaves \ + dep="$(ls /sys/block/$dm_name/slaves \ 2>/dev/null | nawk '{print $1}')" done elif [[ $state == "offline" ]] && ( is_real_device $disk ); then @@ -380,9 +380,9 @@ function on_off_disk # disk state{online,offline} host if is_mpath_device $disk; then dm_name="$(readlink $DEV_DSKDIR/$disk \ | nawk -F / '{print $2}')" - slave="$(ls /sys/block/$dm_name/slaves \ + dep="$(ls /sys/block/$dm_name/slaves \ | nawk '{print $1}')" - lsscsi | egrep $slave > /dev/null + lsscsi | egrep $dep > /dev/null if (($? != 0)); then log_fail "Onlining $disk failed" fi |