LU-6142 socklnd: change UAPI typedefs to proper structure

[fs/lustre-release.git] / lnet / include / lnet / socklnd.h

diff --git a/lnet/include/lnet/socklnd.h b/lnet/include/lnet/socklnd.h
index 4510ae7..45d8320 100644 (file)
--- a/lnet/include/lnet/socklnd.h
+++ b/lnet/include/lnet/socklnd.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -17,16 +15,12 @@
  *
  * 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
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -41,68 +35,56 @@
 #define __LNET_LNET_SOCKLND_H__
 
 #include <lnet/types.h>
-#include <lnet/lib-types.h>
 
 #define SOCKLND_CONN_NONE     (-1)
-#define SOCKLND_CONN_ANY        0
-#define SOCKLND_CONN_CONTROL    1
-#define SOCKLND_CONN_BULK_IN    2
-#define SOCKLND_CONN_BULK_OUT   3
-#define SOCKLND_CONN_NTYPES     4
-
-#define SOCKLND_CONN_ACK        SOCKLND_CONN_BULK_IN
-
-#include <libcfs/libcfs_pack.h>
-typedef struct {
-        __u32                   kshm_magic;     /* magic number of socklnd message */
-        __u32                   kshm_version;   /* version of socklnd message */
-        lnet_nid_t              kshm_src_nid;   /* sender's nid */
-        lnet_nid_t              kshm_dst_nid;   /* destination nid */
-        lnet_pid_t              kshm_src_pid;   /* sender's pid */
-        lnet_pid_t              kshm_dst_pid;   /* destination pid */
-        __u64                   kshm_src_incarnation; /* sender's incarnation */
-        __u64                   kshm_dst_incarnation; /* destination's incarnation */
-        __u32                   kshm_ctype;     /* connection type */
-        __u32                   kshm_nips;      /* # IP addrs */
-        __u32                   kshm_ips[0];    /* IP addrs */
-} WIRE_ATTR ksock_hello_msg_t;
+#define SOCKLND_CONN_ANY       0
+#define SOCKLND_CONN_CONTROL   1
+#define SOCKLND_CONN_BULK_IN   2
+#define SOCKLND_CONN_BULK_OUT  3
+#define SOCKLND_CONN_NTYPES    4
 
-typedef struct {
-        lnet_hdr_t              ksnm_hdr;       /* lnet hdr */
+#define SOCKLND_CONN_ACK       SOCKLND_CONN_BULK_IN
 
-        /*
-         * ksnm_payload is removed because of winnt compiler's limitation:
-         * zero-sized array can only be placed at the tail of [nested]
-         * structure definitions. lnet payload will be stored just after
-         * the body of structure ksock_lnet_msg_t 
-         */
-} WIRE_ATTR ksock_lnet_msg_t;
+struct ksock_hello_msg {
+       __u32                   kshm_magic;     /* magic number of socklnd message */
+       __u32                   kshm_version;   /* version of socklnd message */
+       lnet_nid_t              kshm_src_nid;   /* sender's nid */
+       lnet_nid_t              kshm_dst_nid;   /* destination nid */
+       lnet_pid_t              kshm_src_pid;   /* sender's pid */
+       lnet_pid_t              kshm_dst_pid;   /* destination pid */
+       __u64                   kshm_src_incarnation; /* sender's incarnation */
+       __u64                   kshm_dst_incarnation; /* destination's incarnation */
+       __u32                   kshm_ctype;     /* connection type */
+       __u32                   kshm_nips;      /* # IP addrs */
+       __u32                   kshm_ips[0];    /* IP addrs */
+} WIRE_ATTR;
 
-typedef struct {
-        __u32                   ksm_type;       /* type of socklnd message */
-        __u32                   ksm_csum;       /* checksum if != 0 */
-        __u64                   ksm_zc_cookies[2]; /* Zero-Copy request/ACK cookie */
-        union {
-                ksock_lnet_msg_t lnetmsg;       /* lnet message, it's empty if it's NOOP */
-        } WIRE_ATTR ksm_u;
-} WIRE_ATTR ksock_msg_t;
+struct ksock_lnet_msg {
+       lnet_hdr_t              ksnm_hdr;       /* lnet hdr */
 
-static inline void
-socklnd_init_msg(ksock_msg_t *msg, int type)
-{
-        msg->ksm_csum           = 0;
-        msg->ksm_type           = type;
-        msg->ksm_zc_cookies[0]  = msg->ksm_zc_cookies[1]  = 0;
-}
+       /*
+        * ksnm_payload is removed because of winnt compiler's limitation:
+        * zero-sized array can only be placed at the tail of [nested]
+        * structure definitions. lnet payload will be stored just after
+        * the body of structure struct ksock_lnet_msg
+        */
+} WIRE_ATTR;
 
-#include <libcfs/libcfs_unpack.h>
+struct ksock_msg {
+       __u32                   ksm_type;       /* type of socklnd message */
+       __u32                   ksm_csum;       /* checksum if != 0 */
+       __u64                   ksm_zc_cookies[2]; /* Zero-Copy request/ACK cookie */
+       union {
+               struct ksock_lnet_msg lnetmsg;  /* lnet message, it's empty if it's NOOP */
+       } WIRE_ATTR ksm_u;
+} WIRE_ATTR;
 
-#define KSOCK_MSG_NOOP          0xc0            /* ksm_u empty */
-#define KSOCK_MSG_LNET          0xc1            /* lnet msg */
+#define KSOCK_MSG_NOOP         0xc0            /* ksm_u empty */
+#define KSOCK_MSG_LNET         0xc1            /* lnet msg */
 
 /* We need to know this number to parse hello msg from ksocklnd in
  * other LND (usocklnd, for example) */
-#define KSOCK_PROTO_V2          2
-#define KSOCK_PROTO_V3          3
+#define KSOCK_PROTO_V2         2
+#define KSOCK_PROTO_V3         3
 
 #endif