LU-2731 scripts: Speed up /etc/init.d/lustre stop

[fs/lustre-release.git] / lustre / scripts / lustre

diff --git a/lustre/scripts/lustre b/lustre/scripts/lustre
index b97951f..eeb5941 100644 (file)
--- a/lustre/scripts/lustre
+++ b/lustre/scripts/lustre
@@ -498,6 +498,7 @@ stop_services ()
 {
        local labels=$*
        local result=0
+       local pids=""
        local dir dev label
 
        for label in $labels; do
@@ -512,9 +513,22 @@ stop_services ()
                        # no error
                        continue
                fi
+
                echo "Unmounting $dir"
-               umount $dir || result=2
+               umount $dir &
+
+               if [ -z "$pids" ]; then
+                       pids="$!"
+               else
+                       pids="$pids $!"
+               fi
        done
+
+       # wait for all umount processes to complete, report any errors
+       for pid in $pids; do
+               wait $pid || result=2
+       done
+
        # double check!
        for label in $labels; do
                if mountpt_is_active $label; then