* Cleaned up ptl_hdr_t definition; removed unused fields and moved the

    common length field into the common part of the header.

*   Socknal connection handshake no longer optional (it was --nid_exchange
    in lconf, the 'x' option to lclt::[auto_]connect, the -x option in
    acceptor etc).

*   Added 'uname -a' output and gcc version info in a comment to the output
    of portals wirecheck.

*   Bumped up the portals protocol version number.

*   Added "typed" socknal connections to establish either a single
    connection...

	 'A'    bidirectional control + bulk

    ...or 3 connections...

         'C'    bidirection control
         'I'    bulk in
         'O'    bulk out

    Individual connections can be created using the relevent flag in
    lctl::connect.

    Autoconnect defaults to creating three CIO connections, but can create
    a single A connection if /proc/sys/socknal/typed is zero when the
    connection is established (CAVEAT EMPTOR this also causes ALL existing
    connections to be driven bi-directionally).

    Note that connections types are determined by the initiator.  The
    connection handshake tells the acceptor what type of connection she has
    just accepted, and she tells her socknal.

*   /proc/sys/socknal/eager_ack is now a bitmap of socket types to do eager
    ack on....

          1    enable on 'A' connections
          2    enable on 'C' connections
          4    enable on 'I' connections
          8    enable on 'O' connections (if any messages are ever received)

    Default: 0

    I doubt this facility will be of much use...

*   /proc/sys/socknal/min_bulk controls the size at which messages are
    considered 'bulk' and preferrential sent on 'C' rather than 'O'
    connections.

*   Changed error handling on connections so that when an error is detected
    on a connection...

       (a) ALL connections to the same NID at the same IP are removed.

       (b) The autoconnect route that generated the connection becomes the
           least favourite so that the next autoconnect attempt will use a
           different IP if redundant autoconnect routes have been
           specified.

diff --git a/lnet/libcfs/lwt.c b/lnet/libcfs/lwt.c
index a40a7ed..4c292e5 100644 (file)
--- a/lnet/libcfs/lwt.c
+++ b/lnet/libcfs/lwt.c
@@ -20,7 +20,9 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define EXPORT_SYMTAB
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
 
 #include <linux/config.h>
 #include <linux/module.h>

diff --git a/lustre/portals/libcfs/lwt.c b/lustre/portals/libcfs/lwt.c
index a40a7ed..4c292e5 100644 (file)
--- a/lustre/portals/libcfs/lwt.c
+++ b/lustre/portals/libcfs/lwt.c
@@ -20,7 +20,9 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define EXPORT_SYMTAB
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
 
 #include <linux/config.h>
 #include <linux/module.h>