LU-6245 libcfs: remove libcfsutil.h

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

diff --git a/lnet/selftest/console.h b/lnet/selftest/console.h
index 571e1d8..64ed6b5 100644 (file)
--- a/lnet/selftest/console.h
+++ b/lnet/selftest/console.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -43,7 +43,6 @@
 #ifndef __LST_CONSOLE_H__
 #define __LST_CONSOLE_H__
 
-#ifdef __KERNEL__
 
 #include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
@@ -200,51 +199,61 @@ lstcon_id2hash(lnet_process_id_t id, struct list_head *hash)
 
 extern int lstcon_session_match(lst_sid_t sid);
 extern int lstcon_session_new(char *name, int key, unsigned version,
-                              int timeout, int flags, lst_sid_t *sid_up);
-extern int lstcon_session_info(lst_sid_t *sid_up, int *key, unsigned *verp,
-                               lstcon_ndlist_ent_t *entp, char *name_up, int len);
+                             int timeout, int flags, lst_sid_t __user *sid_up);
+extern int lstcon_session_info(lst_sid_t __user *sid_up, int __user *key,
+                              unsigned __user *verp,
+                              lstcon_ndlist_ent_t __user *entp,
+                              char __user *name_up, int len);
 extern int lstcon_session_end(void);
-extern int lstcon_session_debug(int timeout, struct list_head *result_up);
+extern int lstcon_session_debug(int timeout,
+                               struct list_head __user *result_up);
 extern int lstcon_session_feats_check(unsigned feats);
 extern int lstcon_batch_debug(int timeout, char *name,
-                             int client, struct list_head *result_up);
+                             int client, struct list_head __user *result_up);
 extern int lstcon_group_debug(int timeout, char *name,
-                             struct list_head *result_up);
-extern int lstcon_nodes_debug(int timeout, int nnd, lnet_process_id_t *nds_up,
-                             struct list_head *result_up);
+                             struct list_head __user *result_up);
+extern int lstcon_nodes_debug(int timeout, int nnd,
+                             lnet_process_id_t __user *nds_up,
+                             struct list_head __user *result_up);
 extern int lstcon_group_add(char *name);
 extern int lstcon_group_del(char *name);
 extern int lstcon_group_clean(char *name, int args);
-extern int lstcon_group_refresh(char *name, struct list_head *result_up);
-extern int lstcon_nodes_add(char *name, int nnd, lnet_process_id_t *nds_up,
-                           unsigned *featp, struct list_head *result_up);
-extern int lstcon_nodes_remove(char *name, int nnd, lnet_process_id_t *nds_up,
-                              struct list_head *result_up);
-extern int lstcon_group_info(char *name, lstcon_ndlist_ent_t *gent_up, 
-                             int *index_p, int *ndent_p, lstcon_node_ent_t *ndents_up);
+extern int lstcon_group_refresh(char *name, struct list_head __user *result_up);
+extern int lstcon_nodes_add(char *name, int nnd,
+                           lnet_process_id_t __user *nds_up,
+                           unsigned *featp,
+                           struct list_head __user *result_up);
+extern int lstcon_nodes_remove(char *name, int nnd,
+                              lnet_process_id_t __user *nds_up,
+                              struct list_head __user *result_up);
+extern int lstcon_group_info(char *name, lstcon_ndlist_ent_t __user *gent_up,
+                            int *index_p, int *ndent_p,
+                            lstcon_node_ent_t __user *ndents_up);
 extern int lstcon_group_list(int idx, int len, char __user *name_up);
 extern int lstcon_batch_add(char *name);
 extern int lstcon_batch_run(char *name, int timeout,
-                           struct list_head *result_up);
+                           struct list_head __user *result_up);
 extern int lstcon_batch_stop(char *name, int force,
-                            struct list_head *result_up);
+                            struct list_head __user *result_up);
 extern int lstcon_test_batch_query(char *name, int testidx,
                                   int client, int timeout,
-                                  struct list_head *result_up);
+                                  struct list_head __user *result_up);
 extern int lstcon_batch_del(char *name);
 extern int lstcon_batch_list(int idx, int namelen, char __user *name_up);
-extern int lstcon_batch_info(char *name, lstcon_test_batch_ent_t *ent_up,
-                             int server, int testidx, int *index_p,
-                             int *ndent_p, lstcon_node_ent_t *dents_up);
+extern int lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up,
+                            int server, int testidx, int *index_p,
+                            int *ndent_p, lstcon_node_ent_t __user *dents_up);
 extern int lstcon_group_stat(char *grp_name, int timeout,
-                            struct list_head *result_up);
-extern int lstcon_nodes_stat(int count, lnet_process_id_t *ids_up,
-                            int timeout, struct list_head *result_up);
+                            struct list_head __user *result_up);
+extern int lstcon_nodes_stat(int count, lnet_process_id_t __user *ids_up,
+                            int timeout, struct list_head __user *result_up);
 extern int lstcon_test_add(char *batch_name, int type, int loop,
                           int concur, int dist, int span,
                           char *src_name, char *dst_name,
                           void *param, int paramlen, int *retp,
-                          struct list_head *result_up);
-#endif
+                          struct list_head __user *result_up);
+
+int lstcon_console_init(void);
+int lstcon_console_fini(void);
 
 #endif