* 5630 fix takes ibnal global lock at raised IRQ priority

[fs/lustre-release.git] / lnet / klnds / iiblnd / iiblnd.h

diff --git a/lnet/klnds/iiblnd/iiblnd.h b/lnet/klnds/iiblnd/iiblnd.h
index 0a25a9a..4f04542 100644 (file)
--- a/lnet/klnds/iiblnd/iiblnd.h
+++ b/lnet/klnds/iiblnd/iiblnd.h
@@ -48,7 +48,7 @@
 #include <linux/kmod.h>
 #include <linux/sysctl.h>
 
-#define DEBUG_SUBSYSTEM S_IBNAL
+#define DEBUG_SUBSYSTEM S_NAL
 
 #include <linux/kp30.h>
 #include <portals/p30.h>
@@ -247,7 +247,6 @@ typedef struct
 
 typedef struct
 {
-        __u32                 rd_key;           /* remote key */
         __u32                 rd_nob;           /* # of bytes */
         __u64                 rd_addr;          /* remote io vaddr */
 } kib_rdma_desc_t __attribute__((packed));
@@ -267,6 +266,7 @@ typedef struct
         ptl_hdr_t         ibrm_hdr;             /* portals header */
         __u64             ibrm_cookie;          /* opaque completion cookie */
         __u32             ibrm_num_descs;       /* how many descs */
+        __u32             rd_key;               /* remote key */
         kib_rdma_desc_t   ibrm_desc[0];         /* where to suck/blow */
 } kib_rdma_msg_t __attribute__((packed));
 
@@ -317,7 +317,7 @@ typedef struct kib_rx                           /* receive message */
         __u64                     rx_vaddr;     /* pre-mapped buffer (hca vaddr) */
         kib_msg_t                *rx_msg;       /* pre-mapped buffer (host vaddr) */
         IB_WORK_REQ               rx_wrq;
-        IB_LOCAL_DATASEGMENT      rx_gl;        /* and it's memory */
+        IB_LOCAL_DATASEGMENT      rx_gl;        /* and its memory */
 } kib_rx_t;
 
 typedef struct kib_tx                           /* transmit message */
@@ -370,7 +370,6 @@ typedef struct kib_connreq
         IB_PATH_RECORD                      cr_path;
         CM_REQUEST_INFO                     cr_cmreq;
         CM_CONN_INFO                        cr_discarded;
-        CM_REJECT_INFO                      cr_rej_info;
 } kib_connreq_t;
 
 typedef struct kib_conn