LU-2335 lnet: remove unnecessary libcfs include

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

diff --git a/lnet/include/lnet/lnetst.h b/lnet/include/lnet/lnetst.h
index 6ca9020..22e3527 100644 (file)
--- a/lnet/include/lnet/lnetst.h
+++ b/lnet/include/lnet/lnetst.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.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -45,6 +45,12 @@
 #include <lnet/lnet.h>
 #include <lnet/lib-types.h>
 
+#define LST_FEAT_NONE          (0)
+#define LST_FEAT_BULK_LEN      (1 << 0)        /* enable variable page size */
+
+#define LST_FEATS_EMPTY                (LST_FEAT_NONE)
+#define LST_FEATS_MASK         (LST_FEAT_NONE | LST_FEAT_BULK_LEN)
+
 #define LST_NAME_SIZE           32              /* max name buffer length */
 
 #define LSTIO_DEBUG             0xC00           /* debug */
@@ -235,6 +241,8 @@ typedef struct {
         int                     lstio_ses_key;          /* IN: local key */
         int                     lstio_ses_timeout;      /* IN: session timeout */
         int                     lstio_ses_force;        /* IN: force create ? */
+       /** IN: session features */
+       unsigned                lstio_ses_feats;
         lst_sid_t              *lstio_ses_idp;          /* OUT: session id */
         int                     lstio_ses_nmlen;        /* IN: name length */
         char                   *lstio_ses_namep;        /* IN: session name */
@@ -244,6 +252,8 @@ typedef struct {
 typedef struct {
         lst_sid_t              *lstio_ses_idp;          /* OUT: session id */
         int                    *lstio_ses_keyp;         /* OUT: local key */
+       /** OUT: session features */
+       unsigned               *lstio_ses_featp;
         lstcon_ndlist_ent_t    *lstio_ses_ndinfo;       /* OUT: */
         int                     lstio_ses_nmlen;        /* IN: name length */
         char                   *lstio_ses_namep;        /* OUT: session name */
@@ -305,6 +315,8 @@ typedef struct {
         int                     lstio_grp_nmlen;        /* IN: name length */
         char                   *lstio_grp_namep;        /* IN: group name */
         int                     lstio_grp_count;        /* IN: # of nodes */
+       /** OUT: session features */
+       unsigned               *lstio_grp_featp;
         lnet_process_id_t      *lstio_grp_idsp;         /* IN: nodes */
         cfs_list_t             *lstio_grp_resultp;      /* OUT: list head of result buffer */
 } lstio_group_nodes_args_t;
@@ -457,7 +469,10 @@ typedef struct {
 } lst_test_ping_param_t;
 
 /* more tests */
+#ifdef __WINNT__
 #include <libcfs/libcfs_pack.h>
+#include <libcfs/libcfs_unpack.h>
+#endif
 typedef struct {
         __u32 errors;
         __u32 rpcs_sent;
@@ -469,12 +484,12 @@ typedef struct {
 } WIRE_ATTR srpc_counters_t;
 
 typedef struct {
-        __u32 active_tests;
+        /** milliseconds since current session started */
+        __u32 running_ms;
         __u32 active_batches;
         __u32 zombie_sessions;
         __u32 brw_errors;
         __u32 ping_errors;
 } WIRE_ATTR sfw_counters_t;
-#include <libcfs/libcfs_unpack.h>
 
 #endif