iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: lustre: use strim instead of cfs_trimwhite.

Browse Source 
Linux lib provides identical functionality to cfs_trimwhite,
so discard that code and use the standard.

Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
NeilBrown 2017-12-19 10:01:47 +11:00 committed by Greg Kroah-Hartman
parent 8f114acd4e
commit 213b14b1fa
5 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/lustre/include/linux/libcfs/libcfs_string.h
View File

@ -73,7 +73,6 @@ struct cfs_expr_list {
struct list_head el_exprs;
};
char *cfs_trimwhite(char *str);
int cfs_gettok(struct cfs_lstr *next, char delim, struct cfs_lstr *res);
int cfs_str2num_check(char *str, int nob, unsigned int *num,
unsigned int min, unsigned int max);

20
drivers/staging/lustre/lnet/libcfs/libcfs_string.c
View File

@ -137,26 +137,6 @@ out:
}
EXPORT_SYMBOL(cfs_firststr);
char *
cfs_trimwhite(char *str)
{
char *end;
while (isspace(*str))
str++;
end = str + strlen(str);
while (end > str) {
if (!isspace(end[-1]))
break;
end--;
}
*end = 0;
return str;
}
EXPORT_SYMBOL(cfs_trimwhite);
/**
* Extracts tokens from strings.
*

8
drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
View File

@ -830,7 +830,7 @@ cfs_cpt_table_create_pattern(char *pattern)
int c;
int i;
str = cfs_trimwhite(pattern);
str = strim(pattern);
if (*str == 'n' || *str == 'N') {
pattern = str + 1;
if (*pattern != '\0') {
@ -882,7 +882,7 @@ cfs_cpt_table_create_pattern(char *pattern)
high = node ? MAX_NUMNODES - 1 : nr_cpu_ids - 1;
for (str = cfs_trimwhite(pattern), c = 0;; c++) {
for (str = strim(pattern), c = 0;; c++) {
struct cfs_range_expr *range;
struct cfs_expr_list *el;
char *bracket = strchr(str, '[');
@ -917,7 +917,7 @@ cfs_cpt_table_create_pattern(char *pattern)
goto failed;
}
str = cfs_trimwhite(str + n);
str = strim(str + n);
if (str != bracket) {
CERROR("Invalid pattern %s\n", str);
goto failed;
@ -957,7 +957,7 @@ cfs_cpt_table_create_pattern(char *pattern)
goto failed;
}
str = cfs_trimwhite(bracket + 1);
str = strim(bracket + 1);
}
return cptab;

10
drivers/staging/lustre/lnet/lnet/config.c
View File

@ -275,7 +275,7 @@ lnet_parse_networks(struct list_head *nilist, char *networks)
if (comma)
*comma++ = 0;
net = libcfs_str2net(cfs_trimwhite(str));
net = libcfs_str2net(strim(str));
if (net == LNET_NIDNET(LNET_NID_ANY)) {
LCONSOLE_ERROR_MSG(0x113,
@ -298,7 +298,7 @@ lnet_parse_networks(struct list_head *nilist, char *networks)
}
*bracket = 0;
net = libcfs_str2net(cfs_trimwhite(str));
net = libcfs_str2net(strim(str));
if (net == LNET_NIDNET(LNET_NID_ANY)) {
tmp = str;
goto failed_syntax;
@ -328,7 +328,7 @@ lnet_parse_networks(struct list_head *nilist, char *networks)
if (comma)
*comma++ = 0;
iface = cfs_trimwhite(iface);
iface = strim(iface);
if (!*iface) {
tmp = iface;
goto failed_syntax;
@ -365,7 +365,7 @@ lnet_parse_networks(struct list_head *nilist, char *networks)
comma = strchr(bracket + 1, ',');
if (comma) {
*comma = 0;
str = cfs_trimwhite(str);
str = strim(str);
if (*str) {
tmp = str;
goto failed_syntax;
@ -374,7 +374,7 @@ lnet_parse_networks(struct list_head *nilist, char *networks)
continue;
}
str = cfs_trimwhite(str);
str = strim(str);
if (*str) {
tmp = str;
goto failed_syntax;

2
drivers/staging/lustre/lnet/lnet/router_proc.c
View File

@ -829,7 +829,7 @@ static int __proc_lnet_portal_rotor(void *data, int write,
if (rc < 0)
goto out;
tmp = cfs_trimwhite(buf);
tmp = strim(buf);
rc = -EINVAL;
lnet_res_lock(0);