From 66a6748b27718b6044ba82bc73bdae1e1ee18180 Mon Sep 17 00:00:00 2001
From: Elena Gryaznova <elena.gryaznova@oracle.com>
Date: Mon, 20 Dec 2010 19:40:09 +0300
Subject: [PATCH] b=23049 canonicalize disk names

o=Brian.Murrell
i=grev
---
 lustre/tests/obdfilter-survey.sh |  2 +-
 lustre/tests/sanity.sh           |  2 +-
 lustre/tests/test-framework.sh   | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/lustre/tests/obdfilter-survey.sh b/lustre/tests/obdfilter-survey.sh
index 42187af8..5b0cc38 100644
--- a/lustre/tests/obdfilter-survey.sh
+++ b/lustre/tests/obdfilter-survey.sh
@@ -87,7 +87,7 @@ print_jbd () {
 	local file=$1
 	local facet=$2
 	local varsvc=${facet}_svc
-	local dev=$(basename $(do_facet $facet lctl get_param -n *.${!varsvc}.mntdev))
+	local dev=$(ldiskfs_canon "*.${!varsvc}.mntdev" $facet)
 
 	# ext4: /proc/fs/jbd2/sda1:8/history 
 	# ext3: /proc/fs/jbd/sdb1/history
diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index e6c211d..495214d 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -5741,7 +5741,7 @@ test_129() {
         remote_mds_nodsh && skip "remote MDS with nodsh" && return
 
         local MNTDEV=$(get_mds_mntdev_proc_path)
-        DEV=$(basename $(do_facet mds lctl get_param -n $MNTDEV))
+        DEV=$(ldiskfs_canon "$MNTDEV" mds)
         [ -z "$DEV" ] && error "can't access mds mntdev"
         EFBIG=27
         LDPROC=/proc/fs/ldiskfs/$DEV/max_dir_size
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 1cac5b3..b8be03e 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -3625,3 +3625,16 @@ run_sgpdd () {
     cat ${rslt}.detail
 }
 
+# returns the canonical name for an ldiskfs device
+ldiskfs_canon() {
+        local dev="$1"
+        local facet="$2"
+
+        do_facet $facet "dv=\\\$(lctl get_param -n $dev);
+if foo=\\\$(lvdisplay -c \\\$dv 2>/dev/null); then
+    echo dm-\\\${foo##*:};
+else
+    echo \\\$(basename \\\$dv);
+fi;"
+}
+
-- 
1.8.3.1