Merge 4.4-rc5 into staging-next

[mirror_ubuntu-bionic-kernel.git] / drivers / staging / lustre / lustre / libcfs / module.c

diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
index d781b417fd3893f95024c368404db352ff171ead..75247e920994e16d65404334be2cc25e7f36dc99 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/module.c
+++ b/drivers/staging/lustre/lustre/libcfs/module.c
@@ -274,23 +274,6 @@ static int libcfs_ioctl_int(struct cfs_psdev_file *pfile, unsigned long cmd,
                }
                break;
 
-       case IOC_LIBCFS_PING_TEST: {
-               extern void (kping_client)(struct libcfs_ioctl_data *);
-               void (*ping)(struct libcfs_ioctl_data *);
-
-               CDEBUG(D_IOCTL, "doing %d pings to nid %s (%s)\n",
-                      data->ioc_count, libcfs_nid2str(data->ioc_nid),
-                      libcfs_nid2str(data->ioc_nid));
-               ping = symbol_get(kping_client);
-               if (!ping)
-                       CERROR("symbol_get failed\n");
-               else {
-                       ping(data);
-                       symbol_put(kping_client);
-               }
-               return 0;
-       }
-
        default: {
                struct libcfs_ioctl_handler *hand;
 
@@ -392,7 +375,7 @@ static int __proc_dobitmasks(void *data, int write,
        } else {
                rc = cfs_trace_copyin_string(tmpstr, tmpstrlen, buffer, nob);
                if (rc < 0) {
-                       cfs_trace_free_string_buffer(tmpstr, tmpstrlen);
+                       kfree(tmpstr);
                        return rc;
                }
 
@@ -402,7 +385,7 @@ static int __proc_dobitmasks(void *data, int write,
                        *mask |= D_EMERG;
        }
 
-       cfs_trace_free_string_buffer(tmpstr, tmpstrlen);
+       kfree(tmpstr);
        return rc;
 }