UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: lustre: obdclass: no need to check for kfree 

In class_config_llog_handler() a flag, inst, was used to
determine if it was safe to call kfree. Its not needed so
remove the flag.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: https://review.whamcloud.com/26966
Reviewed-by: Quentin Bouget <quentin.bouget@cea.fr>
Reviewed-by: Ben Evans <bevans@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
James Simmons 2017-08-19 22:26:18 -04:00 committed by Greg Kroah-Hartman
parent 90d1e58830
commit 4599c8ebb2
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/lustre/lustre/obdclass/obd_config.c
View File

@ -1142,7 +1142,7 @@ int class_config_llog_handler(const struct lu_env *env,
char *inst_name = NULL; char *inst_name = NULL;
int inst_len = 0; int inst_len = 0;
size_t lcfg_len; size_t lcfg_len;
int inst = 0, swab = 0; int swab = 0;
lcfg = (struct lustre_cfg *)cfg_buf; lcfg = (struct lustre_cfg *)cfg_buf;
if (lcfg->lcfg_version == __swab32(LUSTRE_CFG_VERSION)) { if (lcfg->lcfg_version == __swab32(LUSTRE_CFG_VERSION)) {
@ -1233,7 +1233,6 @@ int class_config_llog_handler(const struct lu_env *env,
if (clli && clli->cfg_instance && if (clli && clli->cfg_instance &&
LUSTRE_CFG_BUFLEN(lcfg, 0) > 0) { LUSTRE_CFG_BUFLEN(lcfg, 0) > 0) {
inst = 1;
inst_len = LUSTRE_CFG_BUFLEN(lcfg, 0) + inst_len = LUSTRE_CFG_BUFLEN(lcfg, 0) +
sizeof(clli->cfg_instance) * 2 + 4; sizeof(clli->cfg_instance) * 2 + 4;
inst_name = kasprintf(GFP_NOFS, "%s-%p", inst_name = kasprintf(GFP_NOFS, "%s-%p",
@ -1304,8 +1303,6 @@ int class_config_llog_handler(const struct lu_env *env,
rc = class_process_config(lcfg_new); rc = class_process_config(lcfg_new);
kfree(lcfg_new); kfree(lcfg_new);
if (inst)
kfree(inst_name); kfree(inst_name);
break; break;
} }