From: Mr NeilBrown <neilb@suse.de>
Date: Tue, 9 Feb 2021 01:06:24 +0000 (+1100)
Subject: LU-14428 libcfs: discard cfs_trace_allocate_string_buffer
X-Git-Tag: 2.14.52~160
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F91%2F41491%2F6;p=fs%2Flustre-release.git

LU-14428 libcfs: discard cfs_trace_allocate_string_buffer

cfs_trace_allocate_string_buffer() is now only used once, and it is a
simple wrapper for kmalloc().  So discard it and use kmalloc directly.

Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I4658f58d3e073be2092e0af1de0d6ecec15da6a6
Reviewed-on: https://review.whamcloud.com/41491
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Aurelien Degremont <degremoa@amazon.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/libcfs/libcfs/module.c b/libcfs/libcfs/module.c
index d7c1bcf..c433da2 100644
--- a/libcfs/libcfs/module.c
+++ b/libcfs/libcfs/module.c
@@ -294,9 +294,9 @@ static int __proc_dobitmasks(void *data, int write,
 	int           is_printk = (mask == &libcfs_printk) ? 1 : 0;
 
 	if (!write) {
-		rc = cfs_trace_allocate_string_buffer(&tmpstr, tmpstrlen);
-		if (rc < 0)
-			return rc;
+		tmpstr = kmalloc(tmpstrlen, GFP_KERNEL | __GFP_ZERO);
+		if (!tmpstr)
+			return -ENOMEM;
 		libcfs_debug_mask2str(tmpstr, tmpstrlen, *mask, is_subsys);
 		rc = strlen(tmpstr);
 
diff --git a/libcfs/libcfs/tracefile.c b/libcfs/libcfs/tracefile.c
index 36a16fa..060f87b 100644
--- a/libcfs/libcfs/tracefile.c
+++ b/libcfs/libcfs/tracefile.c
@@ -898,18 +898,6 @@ int cfs_trace_copyout_string(char __user *usr_buffer, int usr_buffer_nob,
 }
 EXPORT_SYMBOL(cfs_trace_copyout_string);
 
-int cfs_trace_allocate_string_buffer(char **str, int nob)
-{
-	if (nob > 2 * PAGE_SIZE)	/* string must be "sensible" */
-                return -EINVAL;
-
-	*str = kmalloc(nob, GFP_KERNEL | __GFP_ZERO);
-        if (*str == NULL)
-                return -ENOMEM;
-
-        return 0;
-}
-
 int cfs_trace_dump_debug_buffer_usrstr(void __user *usr_str, int usr_str_nob)
 {
 	char *str;
diff --git a/libcfs/libcfs/tracefile.h b/libcfs/libcfs/tracefile.h
index 601442d..9682f9e 100644
--- a/libcfs/libcfs/tracefile.h
+++ b/libcfs/libcfs/tracefile.h
@@ -56,7 +56,6 @@ void cfs_tracefile_exit(void);
 
 int cfs_trace_copyout_string(char __user *usr_buffer, int usr_buffer_nob,
                              const char *knl_str, char *append);
-int cfs_trace_allocate_string_buffer(char **str, int nob);
 int cfs_trace_dump_debug_buffer_usrstr(void __user *usr_str, int usr_str_nob);
 int cfs_trace_daemon_command(char *str);
 int cfs_trace_daemon_command_usrstr(void __user *usr_str, int usr_str_nob);