Revert "b20288 fix a deadlock in kiblnd_check_conns i=isaac i=maxim"

[fs/lustre-release.git] / lnet / klnds / viblnd / wirecheck.c

diff --git a/lnet/klnds/viblnd/wirecheck.c b/lnet/klnds/viblnd/wirecheck.c
index 7e2a6c3..711b7d8 100644 (file)
--- a/lnet/klnds/viblnd/wirecheck.c
+++ b/lnet/klnds/viblnd/wirecheck.c
@@ -1,14 +1,56 @@
 /* -*- 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.
+ *
+ * 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 (c) 2005, 2010, Oracle and/or its affiliates. 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.
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <portals/api-support.h>
-#include <portals/lib-types.h>
 
-#include "vibnal_wire.h"
+#include <lnet/api-support.h>
+
+/* 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) */
+typedef struct {
+        int     counter;
+} atomic_t;
+
+#include <lnet/lib-types.h>
+
+#define IBNAL_USE_FMR 1
+#include "viblnd_wire.h"
 
 #ifndef HAVE_STRNLEN
 #define strnlen(s, i) strlen(s)
@@ -145,6 +187,10 @@ main (int argc, char **argv)
         CHECK_DEFINE (IBNAL_MSG_GET_REQ);
         CHECK_DEFINE (IBNAL_MSG_GET_DONE);
 
+        CHECK_DEFINE (IBNAL_REJECT_CONN_RACE);
+        CHECK_DEFINE (IBNAL_REJECT_NO_RESOURCES);
+        CHECK_DEFINE (IBNAL_REJECT_FATAL);
+
         CHECK_STRUCT (kib_connparams_t);
         CHECK_MEMBER (kib_connparams_t, ibcp_queue_depth);
         CHECK_MEMBER (kib_connparams_t, ibcp_max_msg_size);
@@ -154,6 +200,13 @@ main (int argc, char **argv)
         CHECK_MEMBER (kib_immediate_msg_t, ibim_hdr);
         CHECK_MEMBER (kib_immediate_msg_t, ibim_payload[13]);
 
+        CHECK_DEFINE (IBNAL_USE_FMR);
+#if IBNAL_USE_FMR
+        CHECK_STRUCT (kib_rdma_desc_t);
+        CHECK_MEMBER (kib_rdma_desc_t, rd_addr);
+        CHECK_MEMBER (kib_rdma_desc_t, rd_nob);
+        CHECK_MEMBER (kib_rdma_desc_t, rd_key);
+#else
         CHECK_STRUCT (kib_rdma_frag_t);
         CHECK_MEMBER (kib_rdma_frag_t, rf_nob);
         CHECK_MEMBER (kib_rdma_frag_t, rf_addr_lo);
@@ -163,7 +216,7 @@ main (int argc, char **argv)
         CHECK_MEMBER (kib_rdma_desc_t, rd_key);
         CHECK_MEMBER (kib_rdma_desc_t, rd_nfrag);
         CHECK_MEMBER (kib_rdma_desc_t, rd_frags[13]);
-
+#endif
         CHECK_STRUCT (kib_putreq_msg_t);
         CHECK_MEMBER (kib_putreq_msg_t, ibprm_hdr);
         CHECK_MEMBER (kib_putreq_msg_t, ibprm_cookie);