b=23531 fix wrong variable use cases in "lustre_acl_xattr_merge2ext()"

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

diff --git a/lustre-iokit/obdfilter-survey/libecho b/lustre-iokit/obdfilter-survey/libecho
index 860d547..454ea2e 100644 (file)
--- a/lustre-iokit/obdfilter-survey/libecho
+++ b/lustre-iokit/obdfilter-survey/libecho
@@ -1,19 +1,36 @@
 #!/bin/bash
-#*  Copyright (C) 2002 Cluster File Systems, Inc.
-#*   Author: Jitendra Pawar <jitendra@clusterfs.com>
-#*
-#*   Lustre-iokit is free software; you can redistribute it and/or
-#*   modify it under the terms of version 2 of the GNU General Public
-#*   License as published by the Free Software Foundation.
-#*
-#*   Lustre-iokit is distributed in the hope that it will be useful,
-#*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#*   GNU General Public License for more details.
-#*
-#*   You should have received a copy of the GNU General Public License
-#*   along with Lustre; if not, write to the Free Software
-#*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# GPL HEADER START
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 only,
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License version 2 for more details (a copy is included
+# in the LICENSE file that accompanied this code).
+#
+# 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.
+#
+# GPL HEADER END
+#
+# Copyright  2008 Sun Microsystems, Inc. All rights reserved
+# Use is subject to license terms.
+#
+# This file is part of Lustre, http://www.lustre.org/
+# Lustre is a trademark of Sun Microsystems, Inc.
+#
+# Author: Jitendra Pawar <jitendra@clusterfs.com>
+
 
 # binaries
 lsmod="/sbin/lsmod"
@@ -39,9 +56,7 @@ dsh () {
     shift 2
     local command="$@"
 
-    local here=$(pwd)
-
-    command="cd $here; export PATH=/sbin:/usr/sbin:\$PATH; $command"
+    command="export PATH=/sbin:/usr/sbin:\$PATH; $command"
 
     case $DSH in
        ssh)
@@ -159,7 +174,7 @@ get_devnos () {
 # do cleanup for netdisk case.
 cleanup_netdisk () {
     for osc in $@; do
-        lctl <<EOF
+        $lctl <<EOF
         cfg_device $osc 
         cleanup
         detach
@@ -170,18 +185,18 @@ EOF
 # do cleanup for network case.
 cleanup_network () {
     local clean_srv_OSS=$1
-    lctl <<EOF
+    $lctl <<EOF
     cfg_device echotmp 
     cleanup
     detach
 EOF
-    remote_shell "root@$server_nid" "lctl << EOF
+    remote_shell "root@$server_nid" "$lctl << EOF
         cfg_device echo_srv
         cleanup
         detach
 EOF"
     if [ $clean_srv_OSS ]; then
-        remote_shell "root@$server_nid" "lctl << EOF
+        remote_shell "root@$server_nid" "$lctl << EOF
             cfg_device OSS
             cleanup
             detach
@@ -231,7 +246,7 @@ cleanup () {
 }
 trap cleanup SIGHUP SIGINT SIGTERM
 
-# gets echoclient device number and attch it to the client UUID
+# gets echoclient device number and attach it to the client UUID
 # 
 # parameter: 1. hostname
 #           2. client name, ex:- ns8:ECHO_ns8
@@ -367,7 +382,7 @@ split_hostname () {
 
 check_cleanup () {
     type_obj="$1"
-    osc_names_str=$(lctl dl | grep $type_obj)
+    osc_names_str=$($lctl dl | grep $type_obj)
     count=0;
     for name in $osc_names_str; do
         count=$((count+1))
@@ -382,7 +397,7 @@ check_cleanup () {
 
 check_setup () {
     type_obj="$1"
-    osc_names_str=$(lctl dl | grep $type_obj)
+    osc_names_str=$($lctl dl | grep $type_obj)
     count=0;
     for name in $osc_names_str; do
         count=$((count+1))