mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
orangefs: two small fixes sent in by other developers
1. Axe some dead code: christophe.jaillet@wanadoo.fr 2. fix memory leak: colin.king@canonical.com (found by Coverity) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJYUsxVAAoJEM9EDqnrzg2+F2AP/2fEGe9K0hiFiOFqeCWlGmI0 cJ8EXdbhzHqd8V3S4HLls3UlJ/4FjE99w4L1CpB42THy7FJ5wdMk4zObDAYLkgEs euhTSe5MJTaNfIxDwna4t6a62Sdsu1wU7neVqT7A+ku1g3DcDoOgV8cOFV+j2wNO /AtvG46XPjL4JooP1H/4xFG4saF6qLgi7WgKK0emLM8ulfMyYyh1GktuyA7YSRJy tJVZ6a13C7J2G2W6N9KAD3ZQ3oaLwbghrL2k2ZNawmHr/2epxFhrlB8guWsl8hz9 dsSbA3TgFummxxI8YJjzdZnlNUkE/yWiMckcTTT02SSxewZtnzyMYfnSS1M7LmP4 /r1d8H9J/kfXFQBDXHKJe/kgBlF+uiiahQFpW9dGrXPkqzLfLq949GOj6Dc/j5bI cPtanoUGDWu3MMyEKnTI+ZFBjET+YDFlFzJPiUXDKK4LnPCiwvvx20+lY5k8YGli 6nR9Pnjky6SC1zW7Wz3ngB+j44aPqkMbfFJxg0tGD2x5+gDTVI05nrmg5YrMv5IS ildQDL6JdPonkk164sGedg6OWsaqWNcK0I/jX85ogjuYbQc8wUM/F2uDZGfrSnpH XvmHeRKeOQ+UEkP1Hq+dI9RJreharkQKuDjUgBKLnWmx0pvcdnDlSiMnGdY2YHHI n/KvTe7iHMW7QhHBpfn/ =GHrD -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
5e176d6973
2 changed files with 3 additions and 10 deletions
|
@ -671,8 +671,10 @@ int orangefs_prepare_debugfs_help_string(int at_boot)
|
|||
*/
|
||||
cdm_element_count =
|
||||
orangefs_prepare_cdm_array(client_debug_array_string);
|
||||
if (cdm_element_count <= 0)
|
||||
if (cdm_element_count <= 0) {
|
||||
kfree(new);
|
||||
goto out;
|
||||
}
|
||||
|
||||
for (i = 0; i < cdm_element_count; i++) {
|
||||
strlcat(new, "\t", string_size);
|
||||
|
|
|
@ -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[1] = val2;
|
||||
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)) {
|
||||
|
|
Loading…
Reference in a new issue