X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=09d62983de79999ee5afa1cc01f7d902fa61054e;hb=64af83190180a8f3e90aea270e2baaecb1ecdb93;hp=4e39c2975329eb83a5f198683fdef5df533a39a2;hpb=2fdc87cb05e0b1841938b4cf39ef07a26c386b2b;p=fs%2Flustre-release.git

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 4e39c29..09d6298 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2883,6 +2883,9 @@ mkfs_opts() {
 
 		if [ $fstype == ldiskfs ]; then
 			fs_mkfs_opts+=${MDSJOURNALSIZE:+" -J size=$MDSJOURNALSIZE"}
+			if [ ! -z $EJOURNAL ]; then
+				fs_mkfs_opts+=${MDSJOURNALSIZE:+" device=$EJOURNAL"}
+			fi
 			fs_mkfs_opts+=${MDSISIZE:+" -i $MDSISIZE"}
 		fi
 	fi
@@ -6008,8 +6011,9 @@ mds_backup_restore() {
 	reformat_external_journal || return 5
 	# step 8: reformat dev
 	echo "reformat new device"
-	add ${SINGLEMDS} $(mkfs_opts ${SINGLEMDS}) --backfstype ldiskfs \
-		--reformat $devname > /dev/null || return 6
+	add ${SINGLEMDS} $(mkfs_opts ${SINGLEMDS} ${devname}) --backfstype \
+		ldiskfs --reformat ${devname} $(mdsvdevname 1) > /dev/null ||
+		exit 6
 	# step 9: mount dev
 	${rcmd} mount -t ldiskfs $opts $devname $mntpt || return 7
 	# step 10: restore metadata