Commit 73517575 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

scripts/common: Simplify block_in_use()'s data check 



Change-Id: I01595e8a796a11c5637bb671ead1a28f6fe9b0a7
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/19553


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent 8564f005

scripts/common.sh

+3 −9
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ eq() { cmp_versions "$1" "==" "$2"; } 
neq() { ! eq "$1" "$2"; }



block_in_use() {

	local block=$1 data pt

	local block=$1 pt

	# Skip devices that are in use - simple blkid it to see if

	# there's any metadata (pt, fs, etc.) present on the drive.

	# FIXME: Special case to ignore atari as a potential false
@@ -349,15 +349,9 @@ block_in_use() { 
		return 1

	fi



	data=$(blkid "/dev/${block##*/}") || data=none



	if [[ $data == none ]]; then

	if ! pt=$(blkid -s PTTYPE -o value "/dev/${block##*/}"); then

		return 1

	fi



	pt=$(blkid -s PTTYPE -o value "/dev/${block##*/}") || pt=none



	if [[ $pt == none || $pt == atari ]]; then

	elif [[ $pt == atari ]]; then

		return 1

	fi