i=liang:

[fs/lustre-release.git] / lnet / selftest / console.h

diff --git a/lnet/selftest/console.h b/lnet/selftest/console.h
index cc72930..222f542 100644 (file)
--- a/lnet/selftest/console.h
+++ b/lnet/selftest/console.h
@@ -38,6 +38,7 @@ typedef struct {
 typedef struct {
         struct list_head        grp_link;       /* chain on global group list */
         int                     grp_ref;        /* reference count */
+        int                     grp_userland;   /* has userland nodes */
         int                     grp_nnode;      /* # of nodes */
         char                    grp_name[LST_NAME_SIZE]; /* group name */
 
@@ -123,8 +124,7 @@ typedef struct {
         struct list_head       *ses_ndl_hash;   /* hash table of nodes */
 
         spinlock_t              ses_rpc_lock;   /* serialize */
-        int                     ses_rpc_pending; /* number of pending RPCs */
-        struct list_head        ses_rpc_list;   /* list head of RPCs */
+        atomic_t                ses_rpc_counter;/* # of initialized RPCs */
         struct list_head        ses_rpc_freelist; /* idle console rpc */
 } lstcon_session_t;                             /*** session descriptor */
 
@@ -184,7 +184,7 @@ extern int lstcon_nodes_stat(int count, lnet_process_id_t *ids_up,
                              int timeout, struct list_head *result_up);
 extern int lstcon_test_add(char *name, int type, int loop, int concur,
                            int dist, int span, char *src_name, char * dst_name,
-                           void *param, int paramlen, struct list_head *result_up);
+                           void *param, int paramlen, int *retp, struct list_head *result_up);
 #endif
 
 #endif