X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=8a08dff6a3c207bcbc2f85a617bef358015aaace;hp=41bdd078739f399549051c404d5c9b9702598fda;hb=b63efc864794860f84f852ba3c89390676b18070;hpb=b0f08a4e902411a8fbdb660e5b32c5821ca7159f

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 41bdd07..8a08dff 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2599,9 +2599,8 @@ ostdevname() {
 			#if $OSTDEVn isn't defined, default is $OSTDEVBASE + num
 			eval DEVPTR=${!DEVNAME:=${OSTDEVBASE}${num}};;
 		zfs )
-			#try $OSTDEVn then $OSTDEVBASE + num then zfs default
-			local foo=${OSTDEVBASE:-${FSNAME}-ost${num}/ost}${num}
-			eval DEVPTR=${!DEVNAME:=$foo};;
+			#dataset name is independent of vdev device names
+			eval DEVPTR=${FSNAME}-ost${num}/ost${num};;
 		* )
 			error "unknown fstype!";;
 	esac
@@ -2640,9 +2639,8 @@ mdsdevname() {
 			#if $MDSDEVn isn't defined, default is $MDSDEVBASE + num
 			eval DEVPTR=${!DEVNAME:=${MDSDEVBASE}${num}};;
 		zfs )
-			# try $MDSDEVn then $MDSDEVBASE + num then zfs default
-			local foo=${MDSDEVBASE:-${FSNAME}-mdt${num}/mdt}${num}
-			eval DEVPTR=${!DEVNAME:=$foo};;
+			#dataset name is independent of vdev device names
+			eval DEVPTR=${FSNAME}-mdt${num}/mdt${num};;
 		* )
 			error "unknown fstype!";;
 	esac