mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-12 07:37:31 -04:00
staging: lustre: uapi: remove lustre_cfg_free wrapper
Replace all lustre_cfg_free() calls with direct kfree() call. 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:
parent
e3acb49a30
commit
18bd20841b
4 changed files with 6 additions and 12 deletions
|
|
@ -246,12 +246,6 @@ static inline struct lustre_cfg *lustre_cfg_new(int cmd,
|
|||
return lcfg;
|
||||
}
|
||||
|
||||
static inline void lustre_cfg_free(struct lustre_cfg *lcfg)
|
||||
{
|
||||
kfree(lcfg);
|
||||
return;
|
||||
}
|
||||
|
||||
static inline int lustre_cfg_sanity_check(void *buf, size_t len)
|
||||
{
|
||||
struct lustre_cfg *lcfg = (struct lustre_cfg *)buf;
|
||||
|
|
|
|||
|
|
@ -1293,7 +1293,7 @@ static int mgc_apply_recover_logs(struct obd_device *mgc,
|
|||
prev_version, max_version, obdname, params);
|
||||
|
||||
rc = class_process_config(lcfg);
|
||||
lustre_cfg_free(lcfg);
|
||||
kfree(lcfg);
|
||||
if (rc)
|
||||
CDEBUG(D_INFO, "process config for %s error %d\n",
|
||||
obdname, rc);
|
||||
|
|
|
|||
|
|
@ -1262,7 +1262,7 @@ int class_config_llog_handler(const struct lu_env *env,
|
|||
lcfg_new->lcfg_nal = 0; /* illegal value for obsolete field */
|
||||
|
||||
rc = class_process_config(lcfg_new);
|
||||
lustre_cfg_free(lcfg_new);
|
||||
kfree(lcfg_new);
|
||||
|
||||
if (inst)
|
||||
kfree(inst_name);
|
||||
|
|
@ -1442,7 +1442,7 @@ int class_manual_cleanup(struct obd_device *obd)
|
|||
if (rc)
|
||||
CERROR("detach failed %d: %s\n", rc, obd->obd_name);
|
||||
out:
|
||||
lustre_cfg_free(lcfg);
|
||||
kfree(lcfg);
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL(class_manual_cleanup);
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ int lustre_process_log(struct super_block *sb, char *logname,
|
|||
lustre_cfg_bufs_set(bufs, 3, &sb, sizeof(sb));
|
||||
lcfg = lustre_cfg_new(LCFG_LOG_START, bufs);
|
||||
rc = obd_process_config(mgc, sizeof(*lcfg), lcfg);
|
||||
lustre_cfg_free(lcfg);
|
||||
kfree(lcfg);
|
||||
|
||||
kfree(bufs);
|
||||
|
||||
|
|
@ -128,7 +128,7 @@ int lustre_end_log(struct super_block *sb, char *logname,
|
|||
lustre_cfg_bufs_set(&bufs, 2, cfg, sizeof(*cfg));
|
||||
lcfg = lustre_cfg_new(LCFG_LOG_END, &bufs);
|
||||
rc = obd_process_config(mgc, sizeof(*lcfg), lcfg);
|
||||
lustre_cfg_free(lcfg);
|
||||
kfree(lcfg);
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL(lustre_end_log);
|
||||
|
|
@ -161,7 +161,7 @@ static int do_lcfg(char *cfgname, lnet_nid_t nid, int cmd,
|
|||
lcfg = lustre_cfg_new(cmd, &bufs);
|
||||
lcfg->lcfg_nid = nid;
|
||||
rc = class_process_config(lcfg);
|
||||
lustre_cfg_free(lcfg);
|
||||
kfree(lcfg);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue