smash the HEAD with the contents of b_cmd. HEAD_PRE_CMD_SMASH and

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

diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h
index 6978aa0..5e32887 100644 (file)
--- a/lnet/klnds/qswlnd/qswlnd.h
+++ b/lnet/klnds/qswlnd/qswlnd.h
@@ -53,11 +53,7 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#include <linux/locks.h>        /* wait_on_buffer */
-#else
-#include <linux/buffer_head.h>  /* wait_on_buffer */
-#endif
+#include <linux/locks.h>
 #include <linux/unistd.h>
 #include <net/sock.h>
 #include <linux/uio.h>
@@ -78,7 +74,6 @@
 #include <linux/kpr.h>
 #include <portals/p30.h>
 #include <portals/lib-p30.h>
-#include <portals/nal.h>
 
 #define KQSW_CHECKSUM   0
 #if KQSW_CHECKSUM
@@ -199,19 +194,17 @@ typedef struct
 
 typedef struct
 {
-        /* dynamic tunables... */
-        int                      kqn_optimized_gets;  /* optimized GETs? */
-#if CONFIG_SYSCTL
-        struct ctl_table_header *kqn_sysctl;          /* sysctl interface */
-#endif        
-} kqswnal_tunables_t;
-
-typedef struct
-{
         char               kqn_init;            /* what's been initialised */
         char               kqn_shuttingdown;    /* I'm trying to shut down */
-        atomic_t           kqn_nthreads;        /* # threads running */
+        atomic_t           kqn_nthreads;        /* # threads not terminated */
+        atomic_t           kqn_nthreads_running;/* # threads still running */
+
+        int                kqn_optimized_gets;  /* optimized GETs? */
+        int                kqn_copy_small_fwd;  /* fwd small msgs from pre-allocated buffer? */
 
+#if CONFIG_SYSCTL
+        struct ctl_table_header *kqn_sysctl;    /* sysctl interface */
+#endif        
         kqswnal_rx_t      *kqn_rxds;            /* all the receive descriptors */
         kqswnal_tx_t      *kqn_txds;            /* all the transmit descriptors */
 
@@ -221,7 +214,6 @@ typedef struct
         spinlock_t         kqn_idletxd_lock;    /* serialise idle txd access */
         wait_queue_head_t  kqn_idletxd_waitq;   /* sender blocks here waiting for idle txd */
         struct list_head   kqn_idletxd_fwdq;    /* forwarded packets block here waiting for idle txd */
-        atomic_t           kqn_pending_txs;     /* # transmits being prepped */
         
         spinlock_t         kqn_sched_lock;      /* serialise packet schedulers */
         wait_queue_head_t  kqn_sched_waitq;     /* scheduler blocks here */
@@ -255,13 +247,12 @@ typedef struct
 /* kqn_init state */
 #define KQN_INIT_NOTHING        0               /* MUST BE ZERO so zeroed state is initialised OK */
 #define KQN_INIT_DATA           1
-#define KQN_INIT_LIB            2
+#define KQN_INIT_PTL            2
 #define KQN_INIT_ALL            3
 
-extern nal_cb_t            kqswnal_lib;
-extern nal_t               kqswnal_api;
-extern kqswnal_tunables_t  kqswnal_tunables;
-extern kqswnal_data_t      kqswnal_data;
+extern nal_cb_t        kqswnal_lib;
+extern nal_t           kqswnal_api;
+extern kqswnal_data_t  kqswnal_data;
 
 /* global pre-prepared replies to keep off the stack */
 extern EP_STATUSBLK    kqswnal_rpc_success;