LU-7734 lnet: fix string.h header inclusion

string.h is intended for user space and libcfs_string.h
is intended for kernel space. Use string.h in liblnetconfig
library.

Add cfs_expr_list_values() in the string.h header file since
it's used in liblnetconfig library.

Signed-off-by: Amir Shehata <amir.shehata@intel.com>
Change-Id: I50b1bb1aff6fe176cfbe28f039f34d063c9265e4
Reviewed-on: http://review.whamcloud.com/21874
Tested-by: Jenkins
Reviewed-by: Olaf Weber <olaf@sgi.com>
Tested-by: Maloo <hpdd-maloo@intel.com>

diff --git a/libcfs/include/libcfs/util/string.h b/libcfs/include/libcfs/util/string.h
index 361cb81..4dc7abf 100644 (file)
--- a/libcfs/include/libcfs/util/string.h
+++ b/libcfs/include/libcfs/util/string.h
@@ -78,6 +78,7 @@ struct cfs_expr_list {
        struct list_head        el_exprs;
 };
 
        struct list_head        el_exprs;
 };
 

+int cfs_expr_list_values(struct cfs_expr_list *expr_list, int max, __u32 **valpp);

 int cfs_gettok(struct cfs_lstr *next, char delim, struct cfs_lstr *res);
 int cfs_str2num_check(char *str, int nob, unsigned *num,
                      unsigned min, unsigned max);
 int cfs_gettok(struct cfs_lstr *next, char delim, struct cfs_lstr *res);
 int cfs_str2num_check(char *str, int nob, unsigned *num,
                      unsigned min, unsigned max);

diff --git a/lnet/utils/lnetconfig/liblnetconfig.c b/lnet/utils/lnetconfig/liblnetconfig.c
index 7202e1e..350e69a 100644 (file)
--- a/lnet/utils/lnetconfig/liblnetconfig.c
+++ b/lnet/utils/lnetconfig/liblnetconfig.c
@@ -47,7 +47,6 @@
 #include <lnet/socklnd.h>
 #include "liblnd.h"
 #include <lnet/lnet.h>
 #include <lnet/socklnd.h>
 #include "liblnd.h"
 #include <lnet/lnet.h>

-#include <libcfs/libcfs_string.h>

 #include <sys/types.h>
 #include <ifaddrs.h>
 #include "liblnetconfig.h"
 #include <sys/types.h>
 #include <ifaddrs.h>
 #include "liblnetconfig.h"

diff --git a/lnet/utils/lnetconfig/liblnetconfig.h b/lnet/utils/lnetconfig/liblnetconfig.h
index d69bfcd..d139976 100644 (file)
--- a/lnet/utils/lnetconfig/liblnetconfig.h
+++ b/lnet/utils/lnetconfig/liblnetconfig.h
@@ -39,7 +39,7 @@
 #define LUSTRE_CFG_RC_MATCH                    -7
 
 #include <lnet/lnet.h>
 #define LUSTRE_CFG_RC_MATCH                    -7
 
 #include <lnet/lnet.h>

-#include <libcfs/libcfs_string.h>
+#include <libcfs/util/string.h>

 
 struct lnet_dlc_network_descr {
        struct list_head network_on_rule;
 
 struct lnet_dlc_network_descr {
        struct list_head network_on_rule;