remove the scimac NAL

diff --git a/lnet/archdep.m4 b/lnet/archdep.m4
index 497e8c2..636ee1d 100644 (file)
--- a/lnet/archdep.m4
+++ b/lnet/archdep.m4
@@ -387,39 +387,6 @@ AC_SUBST(IBNAL)
 AC_SUBST(IBCPPFLAGS)
 AM_CONDITIONAL(BUILD_IBNAL, test x$IBNAL = "xibnal")
 
-def_scamac=/opt/scali/include
-AC_MSG_CHECKING([if ScaMAC support was requested])
-AC_ARG_WITH([scamac],
-       AC_HELP_STRING([--with-scamac=yes/no/path],
-                      [Path to ScaMAC includes (default=/opt/scali/include)]),
-       [
-               case $with_scamac in
-                       yes)
-                               AC_MSG_RESULT([yes])
-                               SCIMACCPPFLAGS="-I/opt/scali/include"
-                               SCIMACNAL="scimacnal"
-                               ;;
-                       no)
-                               AC_MSG_RESULT([no])
-                               SCIMACCPPFLAGS=""
-                               SCIMACNAL=""
-                               ;;
-                       *)
-                               AC_MSG_RESULT([yes])
-                               SCIMACCPPFLAGS="-I$with_scamac -I$with_scamac/icm"
-                               SCIMACNAL="scimacnal"
-                               ;;
-               esac
-       ],[
-               AC_MSG_RESULT([no])
-               SCIMACCPPFLAGS=""
-               SCIMACNAL=""
-       ])
-AC_SUBST(SCIMACCPPFLAGS)
-AC_SUBST(SCIMACNAL)
-AM_CONDITIONAL(BUILD_SCIMACNAL, test x$SCIMACNAL = "xscimacnal")
-# if test "$with_scamac" != no -a -f ${with_scamac}/scamac.h; then
-
 AC_SUBST(MOD_LINK)
 AC_SUBST(LINUX25)
 

diff --git a/lnet/include/linux/kp30.h b/lnet/include/linux/kp30.h
index 0aa183e..181594f 100644 (file)
--- a/lnet/include/linux/kp30.h
+++ b/lnet/include/linux/kp30.h
@@ -640,10 +640,9 @@ enum {
         GMNAL     = 3,
         /*          4 unused */
         TCPNAL    = 5,
-        SCIMACNAL = 6,
-        ROUTER    = 7,
-        IBNAL     = 8,
-        CRAY_KB_ERNAL = 9,
+        ROUTER    = 6,
+        IBNAL     = 7,
+        CRAY_KB_ERNAL = 8,
         NAL_ENUM_END_MARKER
 };
 

diff --git a/lnet/klnds/Makefile.in b/lnet/klnds/Makefile.in
index 12f0c24..b5ed168 100644 (file)
--- a/lnet/klnds/Makefile.in
+++ b/lnet/klnds/Makefile.in
@@ -1,7 +1,6 @@
 @BUILD_GMNAL_TRUE@subdir-m += gmnal
 @BUILD_IBNAL_TRUE@subdir-m += ibnal
 @BUILD_QSWNAL_TRUE@subdir-m += qswnal
-@BUILD_SCIMACNAL_TRUE@subdir-m += scimacnal
 subdir-m += socknal
 
 @INCLUDE_RULES@

diff --git a/lnet/klnds/autoMakefile.am b/lnet/klnds/autoMakefile.am
index 60318ee..9d04a46 100644 (file)
--- a/lnet/klnds/autoMakefile.am
+++ b/lnet/klnds/autoMakefile.am
@@ -3,4 +3,4 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-SUBDIRS = gmnal ibnal qswnal scimacnal socknal
+SUBDIRS = gmnal ibnal qswnal socknal

diff --git a/lnet/libcfs/debug.c b/lnet/libcfs/debug.c
index 3a6508e..2fb06dd 100644 (file)
--- a/lnet/libcfs/debug.c
+++ b/lnet/libcfs/debug.c
@@ -974,7 +974,6 @@ char *portals_nid2str(int nal, ptl_nid_t nid, char *str)
         case QSWNAL:
         case GMNAL:
         case IBNAL:
-        case SCIMACNAL:
                 snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u",
                          (__u32)(nid >> 32), (__u32)nid);
                 break;

diff --git a/lnet/tests/ping_srv.c b/lnet/tests/ping_srv.c
index 84da814..188ba98 100644 (file)
--- a/lnet/tests/ping_srv.c
+++ b/lnet/tests/ping_srv.c
@@ -298,7 +298,7 @@ static void /*__exit*/ pingsrv_cleanup(void)
 
 MODULE_PARM(nal, "i");
 MODULE_PARM_DESC(nal, "Use the specified NAL "
-                "(6-kscimacnal, 2-ksocknal, 1-kqswnal)");
+                "(2-ksocknal, 1-kqswnal)");
  
 MODULE_AUTHOR("Brian Behlendorf (LLNL)");
 MODULE_DESCRIPTION("A kernel space ping server for portals testing");

diff --git a/lnet/tests/sping_srv.c b/lnet/tests/sping_srv.c
index 9e73126..d840ddd 100644 (file)
--- a/lnet/tests/sping_srv.c
+++ b/lnet/tests/sping_srv.c
@@ -284,7 +284,7 @@ static void /*__exit*/ pingsrv_cleanup(void)
 
 MODULE_PARM(nal, "i");
 MODULE_PARM_DESC(nal, "Use the specified NAL "
-                "(6-kscimacnal, 2-ksocknal, 1-kqswnal)");
+                "(2-ksocknal, 1-kqswnal)");
  
 MODULE_AUTHOR("Brian Behlendorf (LLNL)");
 MODULE_DESCRIPTION("A kernel space ping server for portals testing");

diff --git a/lnet/utils/portals.c b/lnet/utils/portals.c
index 86b2da8..f3e82c6 100644 (file)
--- a/lnet/utils/portals.c
+++ b/lnet/utils/portals.c
@@ -81,7 +81,6 @@ static name2num_t nalnames[] = {
         {"elan",       QSWNAL},
         {"gm",         GMNAL},
         {"ib",         IBNAL},
-        {"scimac",      SCIMACNAL},
         {NULL,         -1}
 };
 

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 67a84a6..3693d4c 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -5,6 +5,7 @@ tbd  Cluster File Systems, Inc. <info@clusterfs.com>
        - deal with strange write() on x86-64 (3043)
        - don't dereference NULL peer_ni in ldlm_handle_ast_error (3258)
        - clear page->private before handing to FS (3119)
+    - drop scimac NAL
 
 tbd  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.2.2

diff --git a/lustre/conf/lustre.dtd b/lustre/conf/lustre.dtd
index 96fdc8e..8fd57d8 100644 (file)
--- a/lustre/conf/lustre.dtd
+++ b/lustre/conf/lustre.dtd
@@ -21,12 +21,12 @@
                
 <!ELEMENT network (nid | port | route_tbl | sendmem | recvmem)*>
 <!ATTLIST network %object.attr;
-                  nettype (tcp | elan | gm | scimac) 'tcp'>
+                  nettype (tcp | elan | gm) 'tcp'>
 
 <!ELEMENT routetbl (route)*>
 <!ATTLIST routetbl %object.attr;>
 <!ELEMENT route %object.content;>
-<!ATTLIST route type (elan | tcp | gm | scimac) #REQUIRED
+<!ATTLIST route type (elan | tcp | gm) #REQUIRED
                 gw CDATA #REQUIRED
                 lo CDATA #REQUIRED
                 hi CDATA #IMPLIED >

diff --git a/lustre/configure.in b/lustre/configure.in
index 1427c8c..61d4844 100644 (file)
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -225,8 +225,6 @@ portals/knals/ibnal/Makefile
 portals/knals/ibnal/autoMakefile
 portals/knals/qswnal/Makefile
 portals/knals/qswnal/autoMakefile
-portals/knals/scimacnal/Makefile
-portals/knals/scimacnal/autoMakefile
 portals/knals/socknal/Makefile
 portals/knals/socknal/autoMakefile
 portals/libcfs/Makefile

diff --git a/lustre/doc/lmc.1 b/lustre/doc/lmc.1
index c3345e8..28f51ad 100644 (file)
--- a/lustre/doc/lmc.1
+++ b/lustre/doc/lmc.1
@@ -59,7 +59,7 @@ The arguments required are:
 This will create a new node with the given name if not already present. This is also used to specify a specific node for other elements.
 .TP
 --nettype <type> 
-This can be tcp, elan, gm, scimac.
+This can be tcp, elan, or gm.
 .TP
 --nid nid 
 The network id, e.g. ElanID or IP address as used by Portals. If nid is '*', then the local address of the interface with specified nettype is will be substituted when the node is configured with lconf. An nid of '*' should be used only for the generic client configuration.

diff --git a/lustre/doc/lmc.lyx b/lustre/doc/lmc.lyx
index fb14d0e..bb6ca2b 100644 (file)
--- a/lustre/doc/lmc.lyx
+++ b/lustre/doc/lmc.lyx
@@ -197,7 +197,7 @@ The arguments required are:
 --nettype\SpecialChar ~
 <type> This can be 
 \series bold 
-tcp, elan, gm, scimac.
+tcp, elan, gm.
 \layout Description
 
 --nid\SpecialChar ~

diff --git a/lustre/liblustre/llite_lib.c b/lustre/liblustre/llite_lib.c
index 2dddb2f..a61e368 100644 (file)
--- a/lustre/liblustre/llite_lib.c
+++ b/lustre/liblustre/llite_lib.c
@@ -88,7 +88,6 @@ char *portals_nid2str(int nal, ptl_nid_t nid, char *str)
         case QSWNAL:
         case GMNAL:
         case IBNAL:
-        case SCIMACNAL:
                 snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u",
                          (__u32)(nid >> 32), (__u32)nid);
                 break;

diff --git a/lustre/liblustre/tests/echo_test.c b/lustre/liblustre/tests/echo_test.c
index 1f2ccbe..48d0e6f 100644 (file)
--- a/lustre/liblustre/tests/echo_test.c
+++ b/lustre/liblustre/tests/echo_test.c
@@ -51,7 +51,6 @@ char *portals_nid2str(int nal, ptl_nid_t nid, char *str)
         case QSWNAL:
         case GMNAL:
         case IBNAL:
-        case SCIMACNAL:
                 snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u",
                          (__u32)(nid >> 32), (__u32)nid);
                 break;

diff --git a/lustre/portals/archdep.m4 b/lustre/portals/archdep.m4
index 497e8c2..636ee1d 100644 (file)
--- a/lustre/portals/archdep.m4
+++ b/lustre/portals/archdep.m4
@@ -387,39 +387,6 @@ AC_SUBST(IBNAL)
 AC_SUBST(IBCPPFLAGS)
 AM_CONDITIONAL(BUILD_IBNAL, test x$IBNAL = "xibnal")
 
-def_scamac=/opt/scali/include
-AC_MSG_CHECKING([if ScaMAC support was requested])
-AC_ARG_WITH([scamac],
-       AC_HELP_STRING([--with-scamac=yes/no/path],
-                      [Path to ScaMAC includes (default=/opt/scali/include)]),
-       [
-               case $with_scamac in
-                       yes)
-                               AC_MSG_RESULT([yes])
-                               SCIMACCPPFLAGS="-I/opt/scali/include"
-                               SCIMACNAL="scimacnal"
-                               ;;
-                       no)
-                               AC_MSG_RESULT([no])
-                               SCIMACCPPFLAGS=""
-                               SCIMACNAL=""
-                               ;;
-                       *)
-                               AC_MSG_RESULT([yes])
-                               SCIMACCPPFLAGS="-I$with_scamac -I$with_scamac/icm"
-                               SCIMACNAL="scimacnal"
-                               ;;
-               esac
-       ],[
-               AC_MSG_RESULT([no])
-               SCIMACCPPFLAGS=""
-               SCIMACNAL=""
-       ])
-AC_SUBST(SCIMACCPPFLAGS)
-AC_SUBST(SCIMACNAL)
-AM_CONDITIONAL(BUILD_SCIMACNAL, test x$SCIMACNAL = "xscimacnal")
-# if test "$with_scamac" != no -a -f ${with_scamac}/scamac.h; then
-
 AC_SUBST(MOD_LINK)
 AC_SUBST(LINUX25)
 

diff --git a/lustre/portals/include/linux/kp30.h b/lustre/portals/include/linux/kp30.h
index 0aa183e..181594f 100644 (file)
--- a/lustre/portals/include/linux/kp30.h
+++ b/lustre/portals/include/linux/kp30.h
@@ -640,10 +640,9 @@ enum {
         GMNAL     = 3,
         /*          4 unused */
         TCPNAL    = 5,
-        SCIMACNAL = 6,
-        ROUTER    = 7,
-        IBNAL     = 8,
-        CRAY_KB_ERNAL = 9,
+        ROUTER    = 6,
+        IBNAL     = 7,
+        CRAY_KB_ERNAL = 8,
         NAL_ENUM_END_MARKER
 };
 

diff --git a/lustre/portals/knals/Makefile.in b/lustre/portals/knals/Makefile.in
index 12f0c24..b5ed168 100644 (file)
--- a/lustre/portals/knals/Makefile.in
+++ b/lustre/portals/knals/Makefile.in
@@ -1,7 +1,6 @@
 @BUILD_GMNAL_TRUE@subdir-m += gmnal
 @BUILD_IBNAL_TRUE@subdir-m += ibnal
 @BUILD_QSWNAL_TRUE@subdir-m += qswnal
-@BUILD_SCIMACNAL_TRUE@subdir-m += scimacnal
 subdir-m += socknal
 
 @INCLUDE_RULES@

diff --git a/lustre/portals/knals/autoMakefile.am b/lustre/portals/knals/autoMakefile.am
index 60318ee..9d04a46 100644 (file)
--- a/lustre/portals/knals/autoMakefile.am
+++ b/lustre/portals/knals/autoMakefile.am
@@ -3,4 +3,4 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-SUBDIRS = gmnal ibnal qswnal scimacnal socknal
+SUBDIRS = gmnal ibnal qswnal socknal

diff --git a/lustre/portals/libcfs/debug.c b/lustre/portals/libcfs/debug.c
index 3a6508e..2fb06dd 100644 (file)
--- a/lustre/portals/libcfs/debug.c
+++ b/lustre/portals/libcfs/debug.c
@@ -974,7 +974,6 @@ char *portals_nid2str(int nal, ptl_nid_t nid, char *str)
         case QSWNAL:
         case GMNAL:
         case IBNAL:
-        case SCIMACNAL:
                 snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u",
                          (__u32)(nid >> 32), (__u32)nid);
                 break;

diff --git a/lustre/portals/tests/ping_srv.c b/lustre/portals/tests/ping_srv.c
index 84da814..188ba98 100644 (file)
--- a/lustre/portals/tests/ping_srv.c
+++ b/lustre/portals/tests/ping_srv.c
@@ -298,7 +298,7 @@ static void /*__exit*/ pingsrv_cleanup(void)
 
 MODULE_PARM(nal, "i");
 MODULE_PARM_DESC(nal, "Use the specified NAL "
-                "(6-kscimacnal, 2-ksocknal, 1-kqswnal)");
+                "(2-ksocknal, 1-kqswnal)");
  
 MODULE_AUTHOR("Brian Behlendorf (LLNL)");
 MODULE_DESCRIPTION("A kernel space ping server for portals testing");

diff --git a/lustre/portals/tests/sping_srv.c b/lustre/portals/tests/sping_srv.c
index 9e73126..d840ddd 100644 (file)
--- a/lustre/portals/tests/sping_srv.c
+++ b/lustre/portals/tests/sping_srv.c
@@ -284,7 +284,7 @@ static void /*__exit*/ pingsrv_cleanup(void)
 
 MODULE_PARM(nal, "i");
 MODULE_PARM_DESC(nal, "Use the specified NAL "
-                "(6-kscimacnal, 2-ksocknal, 1-kqswnal)");
+                "(2-ksocknal, 1-kqswnal)");
  
 MODULE_AUTHOR("Brian Behlendorf (LLNL)");
 MODULE_DESCRIPTION("A kernel space ping server for portals testing");

diff --git a/lustre/portals/utils/portals.c b/lustre/portals/utils/portals.c
index 86b2da8..f3e82c6 100644 (file)
--- a/lustre/portals/utils/portals.c
+++ b/lustre/portals/utils/portals.c
@@ -81,7 +81,6 @@ static name2num_t nalnames[] = {
         {"elan",       QSWNAL},
         {"gm",         GMNAL},
         {"ib",         IBNAL},
-        {"scimac",      SCIMACNAL},
         {NULL,         -1}
 };
 

diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c
index a5ec4f1..d865e1f 100644 (file)
--- a/lustre/ptlrpc/events.c
+++ b/lustre/ptlrpc/events.c
@@ -602,7 +602,6 @@ int ptlrpc_init_portals(void)
                 {GMNAL,   "gmnal"},
                 {IBNAL,   "ibnal"},
                 {TCPNAL,  "tcpnal"},
-                {SCIMACNAL, "scimacnal"},
                 {CRAY_KB_ERNAL, "cray_kb_ernal"}};
         int   rc;
         int   i;

diff --git a/lustre/utils/lconf b/lustre/utils/lconf
index 6f74949..2f4130b 100755 (executable)
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -921,15 +921,6 @@ def sys_get_local_address(net_type, wildcard, cluster_id):
             log(e)
     elif net_type == 'gm':
         fixme("automatic local address for GM")
-    elif net_type == 'scimac':
-        scinode="/opt/scali/sbin/scinode"
-        if os.path.exists(scinode):
-            (rc,local) = run(scinode)
-        else:
-            panic (scinode, " not found on node with scimac networking")
-        if rc:
-            panic (scinode, " failed")
-        local=string.rstrip(local[0])
 
     return local
 
@@ -1126,8 +1117,6 @@ class Network(Module):
             self.add_portals_module("knals/qswnal", 'kqswnal')
         if self.net_type == 'gm':
             self.add_portals_module("knals/gmnal", 'kgmnal')
-        if self.net_type == 'scimac':
-            self.add_portals_module("knals/scimacnal", 'kscimacnal')
 
     def nid_to_uuid(self, nid):
         return "NID_%s_UUID" %(nid,)

diff --git a/lustre/utils/lctl.c b/lustre/utils/lctl.c
index fadd9a6..86f20ef 100644 (file)
--- a/lustre/utils/lctl.c
+++ b/lustre/utils/lctl.c
@@ -64,9 +64,9 @@ command_t cmdlist[] = {
         /* Network configuration commands */
         {"==== network config ====", jt_noop, 0, "network config"},
         {"--net", jt_opt_net, 0, "run <command> after setting network to <net>\n"
-         "usage: --net <tcp/elan/myrinet/scimac> <command>"},
+         "usage: --net <tcp/elan/myrinet> <command>"},
         {"network", jt_ptl_network, 0, "commands that follow apply to net\n"
-         "usage: network <tcp/elan/myrinet/scimac>"},
+         "usage: network <tcp/elan/myrinet>"},
         {"autoconn_list", jt_ptl_print_autoconnects, 0, "print autoconnect entries\n"
          "usage: print_autoconns"},
         {"add_autoconn", jt_ptl_add_autoconnect, 0, "add an autoconnect entry\n"
@@ -83,7 +83,7 @@ command_t cmdlist[] = {
          "usage: active_tx"},
         {"mynid", jt_ptl_mynid, 0, "inform the socknal of the local nid. "
          "The nid defaults to hostname for tcp networks and is automatically "
-         "setup for elan/myrinet/scimac networks.\n"
+         "setup for elan/myrinet networks.\n"
          "usage: mynid [<nid>]"},
         {"shownid", jt_ptl_shownid, 0, "print the local NID\n"
          "usage: shownid"},

diff --git a/lustre/utils/lmc b/lustre/utils/lmc
index a341dd8..567689e 100755 (executable)
--- a/lustre/utils/lmc
+++ b/lustre/utils/lmc
@@ -74,7 +74,7 @@ Object creation command summary:
   --node node_name
   --nid nid
   --cluster_id 
-  --nettype tcp|elan|gm|scimac
+  --nettype tcp|elan|gm
   --hostaddr addr
   --port port
   --tcpbuf size
@@ -154,7 +154,7 @@ lmc_options = [
     ('subsystem', "Specify which Lustre subsystems have debug output recorded in the log",  PARAM),
 
     # network 
-    ('nettype', "Specify the network type. This can be tcp/elan/gm/scimac.", PARAM),
+    ('nettype', "Specify the network type. This can be tcp/elan/gm.", PARAM),
     ('nid', "Give the network ID, e.g ElanID/IP Address as used by portals.", PARAM),
     ('tcpbuf', "Optional argument to specify the TCP buffer size.", PARAM, "0"),
     ('port', "Optional argument to specify the TCP port number.", PARAM, DEFAULT_PORT),
@@ -637,7 +637,7 @@ def add_net(gen, lustre, options):
         port = get_option_int(options, 'port')
         tcpbuf = get_option_int(options, 'tcpbuf')
         irq_aff = get_option_int(options, 'irq_affinity')
-    elif net_type in ('elan', 'gm', 'scimac'):
+    elif net_type in ('elan', 'gm'):
         port = 0
         tcpbuf = 0
         irq_aff = 0