RETURN(-EINVAL);
}
- if (LUSTRE_CFG_BUFLEN(lcfg, 2) != sizeof(int)) {
- CERROR("invalid priority\n");
- RETURN(-EINVAL);
- }
if (strcmp(obd->obd_type->typ_name, OBD_MDC_DEVICENAME) &&
strcmp(obd->obd_type->typ_name, OBD_OSC_DEVICENAME)) {
CERROR("can't add connection on non-client dev\n");
OBD_FREE(lprof->lp_lov, strlen(lprof->lp_lov) + 1);
if (lprof->lp_lmv)
OBD_FREE(lprof->lp_lmv, strlen(lprof->lp_lmv) + 1);
+ if (lprof->lp_gkc)
+ OBD_FREE(lprof->lp_gkc, strlen(lprof->lp_gkc) + 1);
OBD_FREE(lprof, sizeof *lprof);
}
}
cfg->cfg_instance);
lustre_cfg_bufs_set_string(&bufs, 0, inst_name);
}
- if (lcfg->lcfg_command == LCFG_ATTACH) {
- lustre_cfg_bufs_set_string(&bufs, 2,
- (char *)cfg->cfg_uuid.uuid);
- }
if (lcfg->lcfg_command == LCFG_SETUP) {
/*add cfg_instance to the end of lcfg buffers*/
lustre_cfg_bufs_set_string(&bufs,
}
}
+ if (cfg && (lcfg->lcfg_command == LCFG_ATTACH)){
+ /*Very Dirty Hack fix here, for mds add,
+ *the mdc in mds should not
+ *change uuid FIXME: Wangdi
+ */
+ if (memcmp(lustre_cfg_string(lcfg, 1), OBD_MDC_DEVICENAME,
+ strlen(OBD_MDC_DEVICENAME)) ||
+ (cfg->cfg_flags & CFG_MODIFY_UUID_FL))
+ lustre_cfg_bufs_set_string(&bufs, 2,
+ (char *)cfg->cfg_uuid.uuid);
+ }
lcfg_new = lustre_cfg_new(lcfg->lcfg_command, &bufs);
lcfg_new->lcfg_num = lcfg->lcfg_num;