From ed0bb6d49310a249a251d06b23786da536bff246 Mon Sep 17 00:00:00 2001 From: pjkirner Date: Wed, 31 Aug 2005 03:32:53 +0000 Subject: [PATCH] Fixes for LNET Directory rename --- lnet/Makefile.in | 2 +- lnet/autoMakefile.am | 2 +- lnet/autoconf/lustre-lnet.m4 | 12 ++++++------ lnet/include/Makefile.am | 2 +- lnet/include/libcfs/darwin/kp30.h | 2 +- lnet/include/libcfs/darwin/lltrace.h | 4 ++-- lnet/include/libcfs/linux/kp30.h | 2 +- lnet/include/libcfs/linux/lltrace.h | 4 ++-- lnet/include/lnet/Makefile.am | 2 +- lnet/include/lnet/api-support.h | 4 ++-- lnet/include/lnet/api.h | 2 +- lnet/include/lnet/darwin/lib-lnet.h | 2 +- lnet/include/lnet/darwin/lib-p30.h | 2 +- lnet/include/lnet/darwin/lib-types.h | 2 +- lnet/include/lnet/darwin/lnet.h | 2 +- lnet/include/lnet/darwin/p30.h | 2 +- lnet/include/lnet/lib-lnet.h | 10 +++++----- lnet/include/lnet/lib-p30.h | 10 +++++----- lnet/include/lnet/lib-types.h | 6 +++--- lnet/include/lnet/linux/lib-lnet.h | 2 +- lnet/include/lnet/linux/lib-p30.h | 2 +- lnet/include/lnet/linux/lib-types.h | 2 +- lnet/include/lnet/linux/lnet.h | 2 +- lnet/include/lnet/linux/p30.h | 2 +- lnet/include/lnet/lnet.h | 8 ++++---- lnet/include/lnet/lnetctl.h | 2 +- lnet/include/lnet/p30.h | 8 ++++---- lnet/include/lnet/ptlctl.h | 2 +- lnet/include/lnet/socklnd.h | 2 +- lnet/include/lnet/types.h | 2 +- lnet/klnds/iiblnd/iiblnd.h | 4 ++-- lnet/klnds/openiblnd/openiblnd.h | 4 ++-- lnet/klnds/qswlnd/qswlnd.h | 4 ++-- lnet/klnds/ralnd/ralnd.h | 4 ++-- lnet/klnds/socklnd/socklnd.h | 6 +++--- lnet/klnds/viblnd/viblnd.h | 4 ++-- lnet/klnds/viblnd/wirecheck.c | 4 ++-- lnet/libcfs/darwin/darwin-utils.c | 2 +- lnet/libcfs/linux/linux-utils.c | 2 +- lnet/libcfs/module.c | 4 ++-- lnet/libcfs/nidstrings.c | 2 +- lnet/lnet/Makefile.in | 10 +++++----- lnet/lnet/acceptor.c | 2 +- lnet/lnet/api-ni.c | 2 +- lnet/lnet/autoMakefile.am | 6 +++--- lnet/lnet/config.c | 2 +- lnet/lnet/lib-eq.c | 2 +- lnet/lnet/lib-md.c | 2 +- lnet/lnet/lib-me.c | 2 +- lnet/lnet/lib-move.c | 2 +- lnet/lnet/lib-msg.c | 2 +- lnet/lnet/lo.c | 2 +- lnet/lnet/module.c | 2 +- lnet/lnet/router.h | 2 +- lnet/tests/ping.h | 2 +- lnet/tests/ping_cli.c | 2 +- lnet/tests/ping_srv.c | 2 +- lnet/tests/sping_cli.c | 2 +- lnet/tests/sping_srv.c | 2 +- lnet/ulnds/bridge.h | 2 +- lnet/ulnds/connection.c | 6 +++--- lnet/ulnds/socklnd/bridge.h | 2 +- lnet/ulnds/socklnd/connection.c | 6 +++--- lnet/utils/debug.c | 4 ++-- lnet/utils/debugctl.c | 4 ++-- lnet/utils/gmlndnid.c | 4 ++-- lnet/utils/l_ioctl.c | 4 ++-- lnet/utils/portals.c | 8 ++++---- lnet/utils/ptlctl.c | 4 ++-- lnet/utils/wirecheck.c | 2 +- 70 files changed, 121 insertions(+), 121 deletions(-) diff --git a/lnet/Makefile.in b/lnet/Makefile.in index 7a33c70..3e76586 100644 --- a/lnet/Makefile.in +++ b/lnet/Makefile.in @@ -1,6 +1,6 @@ subdir-m += libcfs -cray-subdirs += portals +cray-subdirs += lnet cray-subdirs += knals cray-subdirs += tests @CRAY_PORTALS_FALSE@subdir-m += $(cray-subdirs) diff --git a/lnet/autoMakefile.am b/lnet/autoMakefile.am index 36da28b..91f6065 100644 --- a/lnet/autoMakefile.am +++ b/lnet/autoMakefile.am @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -SUBDIRS = libcfs portals knals unals tests doc utils include \ +SUBDIRS = libcfs lnet knals unals tests doc utils include \ autoconf sources: diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index 1111483..40d5f1c 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -561,7 +561,7 @@ fi # # LN_PROG_LINUX # -# Portals linux kernel checks +# LNet linux kernel checks # AC_DEFUN([LN_PROG_LINUX], [LN_CONFIG_ZEROCOPY @@ -735,8 +735,8 @@ lnet/doc/Makefile lnet/include/Makefile lnet/include/libcfs/Makefile lnet/include/libcfs/linux/Makefile -lnet/include/portals/Makefile -lnet/include/portals/linux/Makefile +lnet/include/lnet/Makefile +lnet/include/lnet/linux/Makefile lnet/knals/Makefile lnet/knals/autoMakefile lnet/knals/gmnal/Makefile @@ -756,8 +756,8 @@ lnet/knals/socknal/autoMakefile lnet/libcfs/Makefile lnet/libcfs/autoMakefile lnet/libcfs/linux/Makefile -lnet/portals/Makefile -lnet/portals/autoMakefile +lnet/lnet/Makefile +lnet/lnet/autoMakefile lnet/tests/Makefile lnet/tests/autoMakefile lnet/unals/Makefile @@ -767,7 +767,7 @@ case $lb_target_os in darwin) AC_CONFIG_FILES([ lnet/include/libcfs/darwin/Makefile -lnet/include/portals/darwin/Makefile +lnet/include/lnet/darwin/Makefile lnet/libcfs/darwin/Makefile ]) ;; diff --git a/lnet/include/Makefile.am b/lnet/include/Makefile.am index dd6db1d..006180b 100644 --- a/lnet/include/Makefile.am +++ b/lnet/include/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = libcfs portals +SUBDIRS = libcfs lnet EXTRA_DIST = cygwin-ioctl.h diff --git a/lnet/include/libcfs/darwin/kp30.h b/lnet/include/libcfs/darwin/kp30.h index fa1e10e..ace7f68 100644 --- a/lnet/include/libcfs/darwin/kp30.h +++ b/lnet/include/libcfs/darwin/kp30.h @@ -22,7 +22,7 @@ #include #include -#include +#include #define our_cond_resched() schedule_timeout(1); diff --git a/lnet/include/libcfs/darwin/lltrace.h b/lnet/include/libcfs/darwin/lltrace.h index bb0dc91..d65e54c 100644 --- a/lnet/include/libcfs/darwin/lltrace.h +++ b/lnet/include/libcfs/darwin/lltrace.h @@ -18,9 +18,9 @@ #include #include #include -#include +#include #include #include -#include +#include #endif diff --git a/lnet/include/libcfs/linux/kp30.h b/lnet/include/libcfs/linux/kp30.h index 01052fc..d0e0d67 100644 --- a/lnet/include/libcfs/linux/kp30.h +++ b/lnet/include/libcfs/linux/kp30.h @@ -30,7 +30,7 @@ # include # include # include -# include +# include # include # include # include diff --git a/lnet/include/libcfs/linux/lltrace.h b/lnet/include/libcfs/linux/lltrace.h index 5050abc..d1fa7ae 100644 --- a/lnet/include/libcfs/linux/lltrace.h +++ b/lnet/include/libcfs/linux/lltrace.h @@ -18,9 +18,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/lnet/include/lnet/Makefile.am b/lnet/include/lnet/Makefile.am index 0c44c1c..a08fde9 100644 --- a/lnet/include/lnet/Makefile.am +++ b/lnet/include/lnet/Makefile.am @@ -1,4 +1,4 @@ -portalsdir=$(includedir)/portals +lnetdir=$(includedir)/lnet SUBDIRS := linux if DARWIN diff --git a/lnet/include/lnet/api-support.h b/lnet/include/lnet/api-support.h index 549f8cb..ff76a21 100644 --- a/lnet/include/lnet/api-support.h +++ b/lnet/include/lnet/api-support.h @@ -9,8 +9,8 @@ # include #endif -#include +#include #include -#include +#include #endif diff --git a/lnet/include/lnet/api.h b/lnet/include/lnet/api.h index 793c2f2..127c75d 100644 --- a/lnet/include/lnet/api.h +++ b/lnet/include/lnet/api.h @@ -3,7 +3,7 @@ #include "build_check.h" -#include +#include int LNetInit(int *); diff --git a/lnet/include/lnet/darwin/lib-lnet.h b/lnet/include/lnet/darwin/lib-lnet.h index d3b1ba9..7c2838a 100644 --- a/lnet/include/lnet/darwin/lib-lnet.h +++ b/lnet/include/lnet/darwin/lib-lnet.h @@ -5,7 +5,7 @@ #define __PORTALS_DARWIN_LIB_P30_H__ #ifndef __PORTALS_LIB_P30_H__ -#error Do not #include this file directly. #include instead +#error Do not #include this file directly. #include instead #endif #include diff --git a/lnet/include/lnet/darwin/lib-p30.h b/lnet/include/lnet/darwin/lib-p30.h index d3b1ba9..7c2838a 100644 --- a/lnet/include/lnet/darwin/lib-p30.h +++ b/lnet/include/lnet/darwin/lib-p30.h @@ -5,7 +5,7 @@ #define __PORTALS_DARWIN_LIB_P30_H__ #ifndef __PORTALS_LIB_P30_H__ -#error Do not #include this file directly. #include instead +#error Do not #include this file directly. #include instead #endif #include diff --git a/lnet/include/lnet/darwin/lib-types.h b/lnet/include/lnet/darwin/lib-types.h index 744e566..19ad4b2 100644 --- a/lnet/include/lnet/darwin/lib-types.h +++ b/lnet/include/lnet/darwin/lib-types.h @@ -5,7 +5,7 @@ #define __PORTALS_DARWIN_LIB_TYPES_H__ #ifndef __PORTALS_LIB_TYPES_H__ -#error Do not #include this file directly. #include instead +#error Do not #include this file directly. #include instead #endif #include diff --git a/lnet/include/lnet/darwin/lnet.h b/lnet/include/lnet/darwin/lnet.h index e619fa7..fab937c 100644 --- a/lnet/include/lnet/darwin/lnet.h +++ b/lnet/include/lnet/darwin/lnet.h @@ -5,7 +5,7 @@ #define _PORTALS_DARWIN_P30_H_ #ifndef __PORTALS_P30_H__ -#error Do not #include this file directly. #include instead +#error Do not #include this file directly. #include instead #endif /* diff --git a/lnet/include/lnet/darwin/p30.h b/lnet/include/lnet/darwin/p30.h index e619fa7..fab937c 100644 --- a/lnet/include/lnet/darwin/p30.h +++ b/lnet/include/lnet/darwin/p30.h @@ -5,7 +5,7 @@ #define _PORTALS_DARWIN_P30_H_ #ifndef __PORTALS_P30_H__ -#error Do not #include this file directly. #include instead +#error Do not #include this file directly. #include instead #endif /* diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h index 32322bd..1e8f8f0 100644 --- a/lnet/include/lnet/lib-lnet.h +++ b/lnet/include/lnet/lib-lnet.h @@ -12,17 +12,17 @@ #include "build_check.h" #if defined(__linux__) -#include +#include #elif defined(__APPLE__) -#include +#include #else #error Unsupported Operating System #endif -#include +#include #include -#include -#include +#include +#include extern ptl_apini_t ptl_apini; /* THE network interface (at the API) */ diff --git a/lnet/include/lnet/lib-p30.h b/lnet/include/lnet/lib-p30.h index 32322bd..1e8f8f0 100644 --- a/lnet/include/lnet/lib-p30.h +++ b/lnet/include/lnet/lib-p30.h @@ -12,17 +12,17 @@ #include "build_check.h" #if defined(__linux__) -#include +#include #elif defined(__APPLE__) -#include +#include #else #error Unsupported Operating System #endif -#include +#include #include -#include -#include +#include +#include extern ptl_apini_t ptl_apini; /* THE network interface (at the API) */ diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h index d76a392..baf8de4 100644 --- a/lnet/include/lnet/lib-types.h +++ b/lnet/include/lnet/lib-types.h @@ -13,16 +13,16 @@ #include "build_check.h" #if defined(__linux__) -#include +#include #elif defined(__APPLE__) -#include +#include #else #error Unsupported Operating System #endif #include #include -#include +#include #define WIRE_ATTR __attribute__((packed)) diff --git a/lnet/include/lnet/linux/lib-lnet.h b/lnet/include/lnet/linux/lib-lnet.h index 1c88080..77463bc 100644 --- a/lnet/include/lnet/linux/lib-lnet.h +++ b/lnet/include/lnet/linux/lib-lnet.h @@ -5,7 +5,7 @@ #define __PORTALS_LINUX_LIB_P30_H__ #ifndef __PORTALS_LIB_P30_H__ -#error Do not #include this file directly. #include instead +#error Do not #include this file directly. #include instead #endif #ifdef __KERNEL__ diff --git a/lnet/include/lnet/linux/lib-p30.h b/lnet/include/lnet/linux/lib-p30.h index 1c88080..77463bc 100644 --- a/lnet/include/lnet/linux/lib-p30.h +++ b/lnet/include/lnet/linux/lib-p30.h @@ -5,7 +5,7 @@ #define __PORTALS_LINUX_LIB_P30_H__ #ifndef __PORTALS_LIB_P30_H__ -#error Do not #include this file directly. #include instead +#error Do not #include this file directly. #include instead #endif #ifdef __KERNEL__ diff --git a/lnet/include/lnet/linux/lib-types.h b/lnet/include/lnet/linux/lib-types.h index f896b4b..281a8c2 100644 --- a/lnet/include/lnet/linux/lib-types.h +++ b/lnet/include/lnet/linux/lib-types.h @@ -5,7 +5,7 @@ #define __PORTALS_LINUX_LIB_TYPES_H__ #ifndef __PORTALS_LIB_TYPES_H__ -#error Do not #include this file directly. #include instead +#error Do not #include this file directly. #include instead #endif #ifdef __KERNEL__ diff --git a/lnet/include/lnet/linux/lnet.h b/lnet/include/lnet/linux/lnet.h index b074837..90a8848 100644 --- a/lnet/include/lnet/linux/lnet.h +++ b/lnet/include/lnet/linux/lnet.h @@ -5,7 +5,7 @@ #define __PORTALS_LINUX_P30_H__ #ifndef __PORTALS_P30_H__ -#error Do not #include this file directly. #include instead +#error Do not #include this file directly. #include instead #endif /* diff --git a/lnet/include/lnet/linux/p30.h b/lnet/include/lnet/linux/p30.h index b074837..90a8848 100644 --- a/lnet/include/lnet/linux/p30.h +++ b/lnet/include/lnet/linux/p30.h @@ -5,7 +5,7 @@ #define __PORTALS_LINUX_P30_H__ #ifndef __PORTALS_P30_H__ -#error Do not #include this file directly. #include instead +#error Do not #include this file directly. #include instead #endif /* diff --git a/lnet/include/lnet/lnet.h b/lnet/include/lnet/lnet.h index 9be79b8..a0c33c3 100644 --- a/lnet/include/lnet/lnet.h +++ b/lnet/include/lnet/lnet.h @@ -12,14 +12,14 @@ * User application interface file */ #if defined(__linux__) -#include +#include #elif defined(__APPLE__) -#include +#include #else #error Unsupported Operating System #endif -#include -#include +#include +#include #endif diff --git a/lnet/include/lnet/lnetctl.h b/lnet/include/lnet/lnetctl.h index 8b3c997..4b5b920 100644 --- a/lnet/include/lnet/lnetctl.h +++ b/lnet/include/lnet/lnetctl.h @@ -21,7 +21,7 @@ #ifndef _PTLCTL_H_ #define _PTLCTL_H_ -#include +#include #include #include diff --git a/lnet/include/lnet/p30.h b/lnet/include/lnet/p30.h index 9be79b8..a0c33c3 100644 --- a/lnet/include/lnet/p30.h +++ b/lnet/include/lnet/p30.h @@ -12,14 +12,14 @@ * User application interface file */ #if defined(__linux__) -#include +#include #elif defined(__APPLE__) -#include +#include #else #error Unsupported Operating System #endif -#include -#include +#include +#include #endif diff --git a/lnet/include/lnet/ptlctl.h b/lnet/include/lnet/ptlctl.h index 8b3c997..4b5b920 100644 --- a/lnet/include/lnet/ptlctl.h +++ b/lnet/include/lnet/ptlctl.h @@ -21,7 +21,7 @@ #ifndef _PTLCTL_H_ #define _PTLCTL_H_ -#include +#include #include #include diff --git a/lnet/include/lnet/socklnd.h b/lnet/include/lnet/socklnd.h index 27e6f8e..e90ddef 100644 --- a/lnet/include/lnet/socklnd.h +++ b/lnet/include/lnet/socklnd.h @@ -1,7 +1,7 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * + * * * #defines shared between socknal implementation and utilities */ diff --git a/lnet/include/lnet/types.h b/lnet/include/lnet/types.h index 8581ee1..914bc4c 100644 --- a/lnet/include/lnet/types.h +++ b/lnet/include/lnet/types.h @@ -4,7 +4,7 @@ #include "build_check.h" #include -#include +#include /* This implementation uses the same type for API function return codes and * the completion status in an event */ diff --git a/lnet/klnds/iiblnd/iiblnd.h b/lnet/klnds/iiblnd/iiblnd.h index 47c1119..3ac5280 100644 --- a/lnet/klnds/iiblnd/iiblnd.h +++ b/lnet/klnds/iiblnd/iiblnd.h @@ -51,8 +51,8 @@ #define DEBUG_SUBSYSTEM S_NAL #include -#include -#include +#include +#include #include diff --git a/lnet/klnds/openiblnd/openiblnd.h b/lnet/klnds/openiblnd/openiblnd.h index 7f168ec..b350dc6 100644 --- a/lnet/klnds/openiblnd/openiblnd.h +++ b/lnet/klnds/openiblnd/openiblnd.h @@ -54,8 +54,8 @@ #define DEBUG_SUBSYSTEM S_NAL #include -#include -#include +#include +#include #include #include diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h index d86a13a..6e8aa42 100644 --- a/lnet/klnds/qswlnd/qswlnd.h +++ b/lnet/klnds/qswlnd/qswlnd.h @@ -75,8 +75,8 @@ #define DEBUG_SUBSYSTEM S_NAL #include -#include -#include +#include +#include #define KQSW_CHECKSUM 0 #if KQSW_CHECKSUM diff --git a/lnet/klnds/ralnd/ralnd.h b/lnet/klnds/ralnd/ralnd.h index 6e2a1c7..7e52dd9 100644 --- a/lnet/klnds/ralnd/ralnd.h +++ b/lnet/klnds/ralnd/ralnd.h @@ -54,8 +54,8 @@ #define DEBUG_SUBSYSTEM S_NAL #include -#include -#include +#include +#include #include diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h index ac49d74..bef2cc0 100644 --- a/lnet/klnds/socklnd/socklnd.h +++ b/lnet/klnds/socklnd/socklnd.h @@ -39,9 +39,9 @@ #endif #include -#include -#include -#include +#include +#include +#include /* default vals for tunables/modparams */ #define SOCKNAL_TIMEOUT 50 /* default comms timeout (seconds) */ diff --git a/lnet/klnds/viblnd/viblnd.h b/lnet/klnds/viblnd/viblnd.h index ec2cb34..e552cd7 100644 --- a/lnet/klnds/viblnd/viblnd.h +++ b/lnet/klnds/viblnd/viblnd.h @@ -56,8 +56,8 @@ #define DEBUG_SUBSYSTEM S_NAL #include -#include -#include +#include +#include /* CPU_{L,B}E #defines needed by Voltaire headers */ #include diff --git a/lnet/klnds/viblnd/wirecheck.c b/lnet/klnds/viblnd/wirecheck.c index 50d1f2c..ba479ea 100644 --- a/lnet/klnds/viblnd/wirecheck.c +++ b/lnet/klnds/viblnd/wirecheck.c @@ -6,7 +6,7 @@ #include #include -#include +#include /* This ghastly hack to allows me to include lib-types.h It doesn't affect any * assertions generated here (but fails-safe if it ever does) */ @@ -14,7 +14,7 @@ typedef struct { int counter; } atomic_t; -#include +#include #define IBNAL_USE_FMR 1 #include "vibnal_wire.h" diff --git a/lnet/libcfs/darwin/darwin-utils.c b/lnet/libcfs/darwin/darwin-utils.c index 630db6b..d0241b4 100644 --- a/lnet/libcfs/darwin/darwin-utils.c +++ b/lnet/libcfs/darwin/darwin-utils.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #ifndef isspace inline int diff --git a/lnet/libcfs/linux/linux-utils.c b/lnet/libcfs/linux/linux-utils.c index 67ecb0c..c3163a7 100644 --- a/lnet/libcfs/linux/linux-utils.c +++ b/lnet/libcfs/linux/linux-utils.c @@ -25,7 +25,7 @@ * miscellaneous libcfs stuff */ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include /* * Convert server error code to client format. Error codes are from diff --git a/lnet/libcfs/module.c b/lnet/libcfs/module.c index 2a85f9f..f3fda33 100644 --- a/lnet/libcfs/module.c +++ b/lnet/libcfs/module.c @@ -24,8 +24,8 @@ #endif #define DEBUG_SUBSYSTEM S_PORTALS -#include -#include +#include +#include #include void diff --git a/lnet/libcfs/nidstrings.c b/lnet/libcfs/nidstrings.c index ad5ccfb..081b12a 100644 --- a/lnet/libcfs/nidstrings.c +++ b/lnet/libcfs/nidstrings.c @@ -26,7 +26,7 @@ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include #include #ifndef __KERNEL__ #include diff --git a/lnet/lnet/Makefile.in b/lnet/lnet/Makefile.in index 03dd64c..53461a1 100644 --- a/lnet/lnet/Makefile.in +++ b/lnet/lnet/Makefile.in @@ -1,9 +1,9 @@ -MODULES := portals +MODULES := lnet -portals-objs := api-errno.o api-ni.o config.o -portals-objs += lib-me.o lib-msg.o lib-eq.o lib-md.o -portals-objs += lib-move.o module.o lo.o -portals-objs += router.o router_proc.o acceptor.o +lnet-objs := api-errno.o api-ni.o config.o +lnet-objs += lib-me.o lib-msg.o lib-eq.o lib-md.o +lnet-objs += lib-move.o module.o lo.o +lnet-objs += router.o router_proc.o acceptor.o default: all diff --git a/lnet/lnet/acceptor.c b/lnet/lnet/acceptor.c index 24f22a8..89a6763 100644 --- a/lnet/lnet/acceptor.c +++ b/lnet/lnet/acceptor.c @@ -21,7 +21,7 @@ */ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include #ifdef __KERNEL__ static char *accept = "secure"; diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index e2e682b..ab698ac 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -20,7 +20,7 @@ */ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include #define DEFAULT_NETWORKS "tcp" static char *networks = DEFAULT_NETWORKS; diff --git a/lnet/lnet/autoMakefile.am b/lnet/lnet/autoMakefile.am index 92c5b4f..f9baebc 100644 --- a/lnet/lnet/autoMakefile.am +++ b/lnet/lnet/autoMakefile.am @@ -15,7 +15,7 @@ endif if MODULES if LINUX -modulenet_DATA = portals$(KMODEXT) +modulenet_DATA = lnet$(KMODEXT) endif # LINUX if DARWIN @@ -44,5 +44,5 @@ install-data-hook: $(install_data_hook) EXTRA_DIST := Info.plist router.h -MOSTLYCLEANFILES = *.o *.ko *.mod.c portals -DIST_SOURCES = $(portals-objs:%.o=%.c) +MOSTLYCLEANFILES = *.o *.ko *.mod.c lnet +DIST_SOURCES = $(lnet-objs:%.o=%.c) diff --git a/lnet/lnet/config.c b/lnet/lnet/config.c index 85d8b7b..1bff498 100644 --- a/lnet/lnet/config.c +++ b/lnet/lnet/config.c @@ -20,7 +20,7 @@ */ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include typedef struct { /* tmp struct for parsing routes */ struct list_head ptb_list; /* stash on lists */ diff --git a/lnet/lnet/lib-eq.c b/lnet/lnet/lib-eq.c index 2a84eb9..af0c1aa 100644 --- a/lnet/lnet/lib-eq.c +++ b/lnet/lnet/lib-eq.c @@ -23,7 +23,7 @@ */ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include int LNetEQAlloc(lnet_handle_ni_t interface, lnet_size_t count, diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c index d1b9a74..8564002 100644 --- a/lnet/lnet/lib-md.c +++ b/lnet/lnet/lib-md.c @@ -24,7 +24,7 @@ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include /* must be called with PTL_LOCK held */ void diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c index dae26e9..e0aef8e 100644 --- a/lnet/lnet/lib-me.c +++ b/lnet/lnet/lib-me.c @@ -24,7 +24,7 @@ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include int LNetMEAttach(lnet_handle_ni_t interface, diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index dd88570..f07d462 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -24,7 +24,7 @@ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include #if 1 /* Enforce the rule that the target NID must be that of the receiving NI */ diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c index 3495df9..1a4da6f 100644 --- a/lnet/lnet/lib-msg.c +++ b/lnet/lnet/lib-msg.c @@ -24,7 +24,7 @@ #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include void ptl_enq_event_locked (void *private, ptl_eq_t *eq, lnet_event_t *ev) diff --git a/lnet/lnet/lo.c b/lnet/lnet/lo.c index 1d3ca8b..3dbb5fc 100644 --- a/lnet/lnet/lo.c +++ b/lnet/lnet/lo.c @@ -19,7 +19,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include int lonal_send (ptl_ni_t *ni, diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c index 0d2b90c..d94e555 100644 --- a/lnet/lnet/module.c +++ b/lnet/lnet/module.c @@ -23,7 +23,7 @@ # define EXPORT_SYMTAB #endif #define DEBUG_SUBSYSTEM S_PORTALS -#include +#include static int config_on_load = 0; CFS_MODULE_PARM(config_on_load, "i", int, 0444, diff --git a/lnet/lnet/router.h b/lnet/lnet/router.h index 53cb997..afe377f 100644 --- a/lnet/lnet/router.h +++ b/lnet/lnet/router.h @@ -26,7 +26,7 @@ #define DEBUG_SUBSYSTEM S_PTLROUTER -#include +#include #ifdef __KERNEL__ diff --git a/lnet/tests/ping.h b/lnet/tests/ping.h index 13f1297..3ffadf5 100644 --- a/lnet/tests/ping.h +++ b/lnet/tests/ping.h @@ -2,7 +2,7 @@ #define _KPING_INCLUDED #include -#include +#include #define PTL_PING_IN_SIZE 256 // n packets per buffer diff --git a/lnet/tests/ping_cli.c b/lnet/tests/ping_cli.c index 86999e8..4a803e5 100644 --- a/lnet/tests/ping_cli.c +++ b/lnet/tests/ping_cli.c @@ -26,7 +26,7 @@ #define DEBUG_SUBSYSTEM S_PINGER #include -#include +#include #include "ping.h" /* int portal_debug = D_PING_CLI; */ diff --git a/lnet/tests/ping_srv.c b/lnet/tests/ping_srv.c index d97e307..5adfb26 100644 --- a/lnet/tests/ping_srv.c +++ b/lnet/tests/ping_srv.c @@ -26,7 +26,7 @@ #define DEBUG_SUBSYSTEM S_PINGER #include -#include +#include #include "ping.h" #define STDSIZE (sizeof(int) + sizeof(int) + sizeof(struct timeval)) diff --git a/lnet/tests/sping_cli.c b/lnet/tests/sping_cli.c index 8ad432e..a27cd5f 100644 --- a/lnet/tests/sping_cli.c +++ b/lnet/tests/sping_cli.c @@ -32,7 +32,7 @@ #define DEBUG_SUBSYSTEM S_PINGER #include -#include +#include #include #include #include diff --git a/lnet/tests/sping_srv.c b/lnet/tests/sping_srv.c index 9b18fa3..072a98c 100644 --- a/lnet/tests/sping_srv.c +++ b/lnet/tests/sping_srv.c @@ -31,7 +31,7 @@ #define DEBUG_SUBSYSTEM S_PINGER #include -#include +#include #include "ping.h" #include diff --git a/lnet/ulnds/bridge.h b/lnet/ulnds/bridge.h index e228d5f..9e72903 100644 --- a/lnet/ulnds/bridge.h +++ b/lnet/ulnds/bridge.h @@ -9,7 +9,7 @@ #ifndef TCPNAL_PROCBRIDGE_H #define TCPNAL_PROCBRIDGE_H -#include +#include typedef struct bridge { int alive; diff --git a/lnet/ulnds/connection.c b/lnet/ulnds/connection.c index f32a666..cabfe21 100644 --- a/lnet/ulnds/connection.c +++ b/lnet/ulnds/connection.c @@ -37,9 +37,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/lnet/ulnds/socklnd/bridge.h b/lnet/ulnds/socklnd/bridge.h index e228d5f..9e72903 100644 --- a/lnet/ulnds/socklnd/bridge.h +++ b/lnet/ulnds/socklnd/bridge.h @@ -9,7 +9,7 @@ #ifndef TCPNAL_PROCBRIDGE_H #define TCPNAL_PROCBRIDGE_H -#include +#include typedef struct bridge { int alive; diff --git a/lnet/ulnds/socklnd/connection.c b/lnet/ulnds/socklnd/connection.c index f32a666..cabfe21 100644 --- a/lnet/ulnds/socklnd/connection.c +++ b/lnet/ulnds/socklnd/connection.c @@ -37,9 +37,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/lnet/utils/debug.c b/lnet/utils/debug.c index 418fdbc..294f149 100644 --- a/lnet/utils/debug.c +++ b/lnet/utils/debug.c @@ -49,8 +49,8 @@ #include #include -#include -#include +#include +#include #include #include "parser.h" diff --git a/lnet/utils/debugctl.c b/lnet/utils/debugctl.c index 1b6cd96..9f5df8c 100644 --- a/lnet/utils/debugctl.c +++ b/lnet/utils/debugctl.c @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include "parser.h" diff --git a/lnet/utils/gmlndnid.c b/lnet/utils/gmlndnid.c index 6b9cfe6..8536792 100644 --- a/lnet/utils/gmlndnid.c +++ b/lnet/utils/gmlndnid.c @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/lnet/utils/l_ioctl.c b/lnet/utils/l_ioctl.c index 01dccb1..7884ec0 100644 --- a/lnet/utils/l_ioctl.c +++ b/lnet/utils/l_ioctl.c @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include #include static ioc_handler_t do_ioctl; /* forward ref */ diff --git a/lnet/utils/portals.c b/lnet/utils/portals.c index 4d3b583..519e83a 100644 --- a/lnet/utils/portals.c +++ b/lnet/utils/portals.c @@ -49,13 +49,13 @@ #ifdef REDSTORM #define __QK__ #endif -#include +#include #endif #include -#include -#include -#include +#include +#include +#include #include "parser.h" unsigned int portal_debug; diff --git a/lnet/utils/ptlctl.c b/lnet/utils/ptlctl.c index 5dcf01d..cc88eae 100644 --- a/lnet/utils/ptlctl.c +++ b/lnet/utils/ptlctl.c @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include "parser.h" diff --git a/lnet/utils/wirecheck.c b/lnet/utils/wirecheck.c index 9cb4c4f..4909dd9 100644 --- a/lnet/utils/wirecheck.c +++ b/lnet/utils/wirecheck.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include -- 1.8.3.1