Commit 5e176d69 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-linus-4.10-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux

Pull orangefs updates from Mike Marshall:
 "Two small fixes sent in by other developers:

   - axe some dead code (Christophe Jaillet)

   - fix memory leak (Colin Ian King, found by Coverity)"

* tag 'for-linus-4.10-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: Axe some dead code
  orangefs: fix memory leak of string 'new' on exit path
parents 39d2c3b9 04102c76
...@@ -671,8 +671,10 @@ int orangefs_prepare_debugfs_help_string(int at_boot) ...@@ -671,8 +671,10 @@ int orangefs_prepare_debugfs_help_string(int at_boot)
*/ */
cdm_element_count = cdm_element_count =
orangefs_prepare_cdm_array(client_debug_array_string); orangefs_prepare_cdm_array(client_debug_array_string);
if (cdm_element_count <= 0) if (cdm_element_count <= 0) {
kfree(new);
goto out; goto out;
}
for (i = 0; i < cdm_element_count; i++) { for (i = 0; i < cdm_element_count; i++) {
strlcat(new, "\t", string_size); strlcat(new, "\t", string_size);
......
...@@ -609,15 +609,6 @@ static ssize_t sysfs_service_op_store(struct kobject *kobj, ...@@ -609,15 +609,6 @@ static ssize_t sysfs_service_op_store(struct kobject *kobj,
new_op->upcall.req.param.u.value32[0] = val1; new_op->upcall.req.param.u.value32[0] = val1;
new_op->upcall.req.param.u.value32[1] = val2; new_op->upcall.req.param.u.value32[1] = val2;
goto value_set; goto value_set;
} else if (!strcmp(attr->attr.name,
"perf_counter_reset")) {
if ((val > 0)) {
new_op->upcall.req.param.op =
ORANGEFS_PARAM_REQUEST_OP_READAHEAD_COUNT_SIZE;
} else {
rc = 0;
goto out;
}
} }
} else if (!strcmp(kobj->name, ACACHE_KOBJ_ID)) { } else if (!strcmp(kobj->name, ACACHE_KOBJ_ID)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment