Blame SOURCES/0538-dracut-functions.sh-check_vol_slaves-speedup-LV-VG-n.patch

18971c
From 15384bcedb8002440e1327e97cd9c139af8a32dd Mon Sep 17 00:00:00 2001
18971c
From: Harald Hoyer <harald@redhat.com>
18971c
Date: Mon, 15 Jan 2018 15:44:46 +0100
18971c
Subject: [PATCH] dracut-functions.sh:check_vol_slaves() speedup LV -> VG name
18971c
18971c
Instead of trying all /dev/mapper/* devices to match the maj:min, and
18971c
get the VG name with "lvm lvs", use the dm/name from /sys and dmsetup
18971c
splitname.
18971c
18971c
This should speedup execution with lots of LVs.
18971c
18971c
Cherry-picked from: 9ed6eb741
18971c
Resolves: #1531503
18971c
---
18971c
 dracut-functions.sh | 62 +++++++++++++++++++++------------------------
18971c
 1 file changed, 29 insertions(+), 33 deletions(-)
18971c
18971c
diff --git a/dracut-functions.sh b/dracut-functions.sh
18971c
index ca54bd7f..53289ca0 100755
18971c
--- a/dracut-functions.sh
18971c
+++ b/dracut-functions.sh
18971c
@@ -687,43 +687,39 @@ for_each_host_dev_and_slaves()
18971c
 # but you cannot create the logical volume without the volume group.
18971c
 # And the volume group might be bigger than the devices the LV needs.
18971c
 check_vol_slaves() {
18971c
-    local _lv _vg _pv
18971c
-    for i in /dev/mapper/*; do
18971c
-        [[ $i == /dev/mapper/control ]] && continue
18971c
-        _lv=$(get_maj_min $i)
18971c
-        if [[ $_lv = $2 ]]; then
18971c
-            _vg=$(lvm lvs --noheadings -o vg_name $i 2>/dev/null)
18971c
-            # strip space
18971c
-            _vg="${_vg//[[:space:]]/}"
18971c
-            if [[ $_vg ]]; then
18971c
-                for _pv in $(lvm vgs --noheadings -o pv_name "$_vg" 2>/dev/null)
18971c
-                do
18971c
-                    check_block_and_slaves $1 $(get_maj_min $_pv) && return 0
18971c
-                done
18971c
-            fi
18971c
-        fi
18971c
-    done
18971c
+    local _lv _vg _pv _dm _majmin
18971c
+    _majmin="$2"
18971c
+    _lv="/dev/block/$_majmin"
18971c
+    _dm=/sys/dev/block/$_majmin/dm
18971c
+    [[ -f $_dm/uuid  && $(<$_dm/uuid) =~ LVM-* ]] || return 1
18971c
+    _vg=$(dmsetup splitname --noheadings -o vg_name $(<"$_dm/name") )
18971c
+    # strip space
18971c
+    _vg="${_vg//[[:space:]]/}"
18971c
+    if [[ $_vg ]]; then
18971c
+        for _pv in $(lvm vgs --noheadings -o pv_name "$_vg" 2>/dev/null)
18971c
+        do
18971c
+            check_block_and_slaves $1 $(get_maj_min $_pv) && return 0
18971c
+        done
18971c
+    fi
18971c
     return 1
18971c
 }
18971c
 
18971c
 check_vol_slaves_all() {
18971c
-    local _lv _vg _pv
18971c
-    for i in /dev/mapper/*; do
18971c
-        [[ $i == /dev/mapper/control ]] && continue
18971c
-        _lv=$(get_maj_min $i)
18971c
-        if [[ $_lv = $2 ]]; then
18971c
-            _vg=$(lvm lvs --noheadings -o vg_name $i 2>/dev/null)
18971c
-            # strip space
18971c
-            _vg="${_vg//[[:space:]]/}"
18971c
-            if [[ $_vg ]]; then
18971c
-                for _pv in $(lvm vgs --noheadings -o pv_name "$_vg" 2>/dev/null)
18971c
-                do
18971c
-                    check_block_and_slaves_all $1 $(get_maj_min $_pv)
18971c
-                done
18971c
-                return 0
18971c
-            fi
18971c
-        fi
18971c
-    done
18971c
+    local _lv _vg _pv _majmin
18971c
+    _majmin="$2"
18971c
+    _lv="/dev/block/$_majmin"
18971c
+    _dm="/sys/dev/block/$_majmin/dm"
18971c
+    [[ -f $_dm/uuid  && $(<$_dm/uuid) =~ LVM-* ]] || return 1
18971c
+    _vg=$(dmsetup splitname --noheadings -o vg_name $(<"$_dm/name") )
18971c
+    # strip space
18971c
+    _vg="${_vg//[[:space:]]/}"
18971c
+    if [[ $_vg ]]; then
18971c
+        for _pv in $(lvm vgs --noheadings -o pv_name "$_vg" 2>/dev/null)
18971c
+        do
18971c
+            check_block_and_slaves_all $1 $(get_maj_min $_pv)
18971c
+        done
18971c
+        return 0
18971c
+    fi
18971c
     return 1
18971c
 }
18971c