diff options
| author | James Simmons | 2015-10-22 03:52:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-25 02:52:21 +0100 |
| commit | a620ec637274706370db1b2178d409304a4f66eb (patch) | |
| tree | 68bf9fab29e72d05c0ff15bd726c172d17f9f671 /drivers/staging/lustre | |
| parent | staging: lustre: remove libcfs_init_string function (diff) | |
| download | kernel-qcow2-linux-a620ec637274706370db1b2178d409304a4f66eb.tar.gz kernel-qcow2-linux-a620ec637274706370db1b2178d409304a4f66eb.tar.xz kernel-qcow2-linux-a620ec637274706370db1b2178d409304a4f66eb.zip | |
staging: lustre: remove cfs_ip_addr_free wrapper
No need to have a one line wrapper in libcfs that only
is used to delete a list which is only done once in the
LNet layer.
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/libcfs_string.h | 1 | ||||
| -rw-r--r-- | drivers/staging/lustre/lnet/lnet/config.c | 2 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/libcfs/libcfs_string.c | 7 |
3 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h index d178e43c8f50..908efaac9ed7 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h @@ -102,6 +102,5 @@ int cfs_expr_list_parse(char *str, int len, unsigned min, unsigned max, void cfs_expr_list_free_list(struct list_head *list); int cfs_ip_addr_parse(char *str, int len, struct list_head *list); int cfs_ip_addr_match(__u32 addr, struct list_head *list); -void cfs_ip_addr_free(struct list_head *list); #endif diff --git a/drivers/staging/lustre/lnet/lnet/config.c b/drivers/staging/lustre/lnet/lnet/config.c index b09a438c49d6..1b3bc8386524 100644 --- a/drivers/staging/lustre/lnet/lnet/config.c +++ b/drivers/staging/lustre/lnet/lnet/config.c @@ -824,7 +824,7 @@ lnet_match_network_token(char *token, int len, __u32 *ipaddrs, int nip) for (rc = i = 0; !rc && i < nip; i++) rc = cfs_ip_addr_match(ipaddrs[i], &list); - cfs_ip_addr_free(&list); + cfs_expr_list_free_list(&list); return rc; } diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c index 896185f54c4f..51669613fc68 100644 --- a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c +++ b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c @@ -624,10 +624,3 @@ cfs_ip_addr_match(__u32 addr, struct list_head *list) return i == 4; } EXPORT_SYMBOL(cfs_ip_addr_match); - -void -cfs_ip_addr_free(struct list_head *list) -{ - cfs_expr_list_free_list(list); -} -EXPORT_SYMBOL(cfs_ip_addr_free); |