LU-2675 lnet: assume a kernel build

[fs/lustre-release.git] / lnet / selftest / conctl.c

diff --git a/lnet/selftest/conctl.c b/lnet/selftest/conctl.c
index 0cc5151..ea67cc3 100644 (file)
--- a/lnet/selftest/conctl.c
+++ b/lnet/selftest/conctl.c
@@ -39,14 +39,13 @@
  *
  * Author: Liang Zhen <liangzhen@clusterfs.com>
  */
-#ifdef __KERNEL__
 
 #include <libcfs/libcfs.h>
 #include <lnet/lib-lnet.h>
 #include <lnet/lnetst.h>
 #include "console.h"
 
-int
+static int
 lst_session_new_ioctl(lstio_session_new_args_t *args)
 {
         char      *name;
@@ -82,7 +81,7 @@ lst_session_new_ioctl(lstio_session_new_args_t *args)
        return rc;
 }
 
-int
+static int
 lst_session_end_ioctl(lstio_session_end_args_t *args)
 {
         if (args->lstio_ses_key != console_session.ses_key)
@@ -91,7 +90,7 @@ lst_session_end_ioctl(lstio_session_end_args_t *args)
         return lstcon_session_end();
 }
 
-int
+static int
 lst_session_info_ioctl(lstio_session_info_args_t *args)
 {
         /* no checking of key */
@@ -113,7 +112,7 @@ lst_session_info_ioctl(lstio_session_info_args_t *args)
                                    args->lstio_ses_nmlen);
 }
 
-int
+static int
 lst_debug_ioctl(lstio_debug_args_t *args)
 {
         char   *name   = NULL;
@@ -194,7 +193,7 @@ out:
         return rc;
 }
 
-int
+static int
 lst_group_add_ioctl(lstio_group_add_args_t *args)
 {
         char           *name;
@@ -204,7 +203,7 @@ lst_group_add_ioctl(lstio_group_add_args_t *args)
                 return -EACCES;
 
         if (args->lstio_grp_namep == NULL||
-            args->lstio_grp_nmlen <= 0 || 
+           args->lstio_grp_nmlen <= 0 ||
             args->lstio_grp_nmlen > LST_NAME_SIZE)
                 return -EINVAL;
 
@@ -227,7 +226,7 @@ lst_group_add_ioctl(lstio_group_add_args_t *args)
         return rc;
 }
 
-int
+static int
 lst_group_del_ioctl(lstio_group_del_args_t *args)
 {
         int     rc;
@@ -260,7 +259,7 @@ lst_group_del_ioctl(lstio_group_del_args_t *args)
         return rc;
 }
 
-int
+static int
 lst_group_update_ioctl(lstio_group_update_args_t *args)
 {
         int     rc;
@@ -271,7 +270,7 @@ lst_group_update_ioctl(lstio_group_update_args_t *args)
 
         if (args->lstio_grp_resultp == NULL ||
             args->lstio_grp_namep == NULL ||
-            args->lstio_grp_nmlen <= 0 || 
+           args->lstio_grp_nmlen <= 0 ||
             args->lstio_grp_nmlen > LST_NAME_SIZE)
                 return -EINVAL;
 
@@ -317,7 +316,7 @@ lst_group_update_ioctl(lstio_group_update_args_t *args)
         return rc;
 }
 
-int
+static int
 lst_nodes_add_ioctl(lstio_group_nodes_args_t *args)
 {
        unsigned feats;
@@ -362,10 +361,10 @@ lst_nodes_add_ioctl(lstio_group_nodes_args_t *args)
         return rc;
 }
 
-int
+static int
 lst_group_list_ioctl(lstio_group_list_args_t *args)
 {
-        if (args->lstio_grp_key != console_session.ses_key) 
+       if (args->lstio_grp_key != console_session.ses_key)
                 return -EACCES;
 
         if (args->lstio_grp_idx   < 0 ||
@@ -379,7 +378,7 @@ lst_group_list_ioctl(lstio_group_list_args_t *args)
                               args->lstio_grp_namep);
 }
 
-int
+static int
 lst_group_info_ioctl(lstio_group_info_args_t *args)
 {
         char           *name;
@@ -431,7 +430,7 @@ lst_group_info_ioctl(lstio_group_info_args_t *args)
 
         LIBCFS_FREE(name, args->lstio_grp_nmlen + 1);
 
-        if (rc != 0) 
+       if (rc != 0)
                 return rc;
 
        if (args->lstio_grp_dentsp != NULL &&
@@ -442,7 +441,7 @@ lst_group_info_ioctl(lstio_group_info_args_t *args)
        return 0;
 }
 
-int
+static int
 lst_batch_add_ioctl(lstio_batch_add_args_t *args)
 {
         int             rc;
@@ -475,7 +474,7 @@ lst_batch_add_ioctl(lstio_batch_add_args_t *args)
         return rc;
 }
 
-int
+static int
 lst_batch_run_ioctl(lstio_batch_run_args_t *args)
 {
         int             rc;
@@ -509,7 +508,7 @@ lst_batch_run_ioctl(lstio_batch_run_args_t *args)
         return rc;
 }
 
-int
+static int
 lst_batch_stop_ioctl(lstio_batch_stop_args_t *args)
 {
         int             rc;
@@ -544,7 +543,7 @@ lst_batch_stop_ioctl(lstio_batch_stop_args_t *args)
         return rc;
 }
 
-int
+static int
 lst_batch_query_ioctl(lstio_batch_query_args_t *args)
 {
         char   *name;
@@ -585,7 +584,7 @@ lst_batch_query_ioctl(lstio_batch_query_args_t *args)
         return rc;
 }
 
-int
+static int
 lst_batch_list_ioctl(lstio_batch_list_args_t *args)
 {
         if (args->lstio_bat_key != console_session.ses_key)
@@ -602,7 +601,7 @@ lst_batch_list_ioctl(lstio_batch_list_args_t *args)
                               args->lstio_bat_namep);
 }
 
-int
+static int
 lst_batch_info_ioctl(lstio_batch_info_args_t *args)
 {
         char           *name;
@@ -667,7 +666,7 @@ lst_batch_info_ioctl(lstio_batch_info_args_t *args)
        return rc;
 }
 
-int
+static int
 lst_stat_query_ioctl(lstio_stat_args_t *args)
 {
         int             rc;
@@ -714,7 +713,7 @@ lst_stat_query_ioctl(lstio_stat_args_t *args)
        return rc;
 }
 
-int lst_test_add_ioctl(lstio_test_args_t *args)
+static int lst_test_add_ioctl(lstio_test_args_t *args)
 {
        char            *batch_name;
        char            *src_name = NULL;
@@ -930,4 +929,3 @@ out:
 
 EXPORT_SYMBOL(lstcon_ioctl_entry);
 
-#endif