ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/setup: Revert back to using lsblk for mount checks

Browse Source 
lsblk will include all the potential holders|virtual devices given
block device may be part of. This is relevant in case a nvme|virtio
device is part of the lvm|md setup.

Change-Id: I32198ddcf71746c3cbad4a96496a1762a5c201cd
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5167
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Michal Berger 2020-11-19 10:27:37 +01:00 committed by Tomasz Zawadzki
parent 657e50a032
commit 06058e9bdb
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/setup.sh
View File

@ -182,17 +182,15 @@ function get_block_dev_from_bdf() {
function get_mounted_part_dev_from_bdf_block() { function get_mounted_part_dev_from_bdf_block() {
local bdf=$1 local bdf=$1
local blocks block part local blocks block mounts
blocks=($(get_block_dev_from_bdf "$bdf")) blocks=($(get_block_dev_from_bdf "$bdf"))
for block in "${blocks[@]}"; do for block in "${blocks[@]}"; do
for part in "/sys/block/$block/$block"*; do mounts=$(lsblk -n -o MOUNTPOINT "/dev/$block")
[[ -b /dev/${part##*/} ]] || continue if [[ -n $mounts ]]; then
if [[ $(< /proc/self/mountinfo) == *" $(< "$part/dev") "* ]]; then echo "$block"
echo "${part##*/}" fi
fi
done
done done
} }
@ -264,7 +262,8 @@ function collect_driver() {
function verify_bdf_mounts() { function verify_bdf_mounts() {
local bdf=$1 local bdf=$1
local blknames=($(get_mounted_part_dev_from_bdf_block "$bdf")) local blknames
blknames=($(get_mounted_part_dev_from_bdf_block "$bdf")) || return 1
if ((${#blknames[@]} > 0)); then if ((${#blknames[@]} > 0)); then
for name in "${blknames[@]}"; do for name in "${blknames[@]}"; do