Commit 4599c8eb authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

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: default avatarJames 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: default avatarQuentin Bouget <quentin.bouget@cea.fr>
Reviewed-by: default avatarBen Evans <bevans@cray.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 90d1e588

drivers/staging/lustre/lustre/obdclass/obd_config.c

+2 −5
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ int class_config_llog_handler(const struct lu_env *env, 
		char *inst_name = NULL;

		int inst_len = 0;

		size_t lcfg_len;

		int inst = 0, swab = 0;

		int swab = 0;



		lcfg = (struct lustre_cfg *)cfg_buf;

		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 &&

		    LUSTRE_CFG_BUFLEN(lcfg, 0) > 0) {

			inst = 1;

			inst_len = LUSTRE_CFG_BUFLEN(lcfg, 0) +

				   sizeof(clli->cfg_instance) * 2 + 4;

			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);

		kfree(lcfg_new);



		if (inst)

		kfree(inst_name);

		break;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE