LU-12756 lnet: Refactor lnet_find_best_lpni_on_net

[fs/lustre-release.git] / lustre-iokit / obdfilter-survey / iokit-libecho

diff --git a/lustre-iokit/obdfilter-survey/iokit-libecho b/lustre-iokit/obdfilter-survey/iokit-libecho
index 1bc2c22..a155d4b 100644 (file)
--- a/lustre-iokit/obdfilter-survey/iokit-libecho
+++ b/lustre-iokit/obdfilter-survey/iokit-libecho
@@ -18,18 +18,14 @@
 #
 # You should have received a copy of the GNU General Public License
 # version 2 along with this program; If not, see
-# http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
-#
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# http://www.gnu.org/licenses/gpl-2.0.html
 #
 # GPL HEADER END
 #
 # Copyright  2008 Sun Microsystems, Inc. All rights reserved
 # Use is subject to license terms.
 #
-# Copyright (c) 2012, 2014, Intel Corporation.
+# Copyright (c) 2012, 2017, Intel Corporation.
 #
 # This file is part of Lustre, http://www.lustre.org/
 # Lustre is a trademark of Sun Microsystems, Inc.
@@ -217,6 +213,8 @@ cleanup_network () {
 
 # do cleanup and exit.
 cleanup () {
+       trap 0
+
        local exit_status=$1
        local host
 
@@ -259,7 +257,7 @@ cleanup () {
        fi
        exit $exit_status
 }
-trap 'cleanup 0 $clean_srv_OSS $cleanup_oscs' SIGHUP SIGINT SIGTERM
+trap 'cleanup 0 $clean_srv_OSS $cleanup_oscs' EXIT SIGHUP SIGINT SIGTERM
 
 # gets echoclient device number and attach it to the client UUID
 # Results are  returned by an echo followed by an exit