* GPL HEADER END
*/
/*
- * Copyright (c) 2013, 2015, Intel Corporation.
+ * Copyright (c) 2013, 2017, Intel Corporation.
* Use is subject to license terms.
*
* lustre/osp/lwp_dev.c
#define DEBUG_SUBSYSTEM S_OST
#include <obd_class.h>
-#include <lustre_param.h>
+#include <uapi/linux/lustre/lustre_param.h>
#include <lustre_log.h>
#include <linux/kthread.h>
lustre_cfg_bufs_reset(bufs, lwp_name);
lustre_cfg_bufs_set_string(bufs, 1, server_uuid);
lustre_cfg_bufs_set_string(bufs, 2, nidstring);
- lcfg = lustre_cfg_new(LCFG_SETUP, bufs);
- if (lcfg == NULL)
+ OBD_ALLOC(lcfg, lustre_cfg_len(bufs->lcfg_bufcount, bufs->lcfg_buflen));
+ if (!lcfg)
GOTO(out, rc = -ENOMEM);
+ lustre_cfg_init(lcfg, LCFG_SETUP, bufs);
rc = client_obd_setup(lwp->lpd_obd, lcfg);
if (rc != 0) {
OBD_FREE_PTR(bufs);
if (server_uuid != NULL)
OBD_FREE(server_uuid, len);
- if (lcfg != NULL)
- lustre_cfg_free(lcfg);
+ if (lcfg)
+ OBD_FREE(lcfg, lustre_cfg_len(lcfg->lcfg_bufcount,
+ lcfg->lcfg_buflens));
if (rc)
client_obd_cleanup(lwp->lpd_obd);
RETURN(rc);
}
- if (lprocfs_obd_setup(lwp->lpd_obd) == 0) {
- sptlrpc_lprocfs_cliobd_attach(lwp->lpd_obd);
- ptlrpc_lprocfs_register_obd(lwp->lpd_obd);
+ rc = lprocfs_obd_setup(lwp->lpd_obd, true);
+ if (rc) {
+ CERROR("%s: lprocfs_obd_setup failed. %d\n",
+ lwp->lpd_obd->obd_name, rc);
+ ptlrpcd_decref();
+ RETURN(rc);
}
+ rc = sptlrpc_lprocfs_cliobd_attach(lwp->lpd_obd);
+ if (rc) {
+ CERROR("%s: sptlrpc_lprocfs_cliobd_attached failed. %d\n",
+ lwp->lpd_obd->obd_name, rc);
+ ptlrpcd_decref();
+ RETURN(rc);
+ }
+
+ ptlrpc_lprocfs_register_obd(lwp->lpd_obd);
+
RETURN(0);
}
LASSERT(m->lpd_obd);
ptlrpc_lprocfs_unregister_obd(m->lpd_obd);
- lprocfs_obd_cleanup(m->lpd_obd);
rc = client_obd_cleanup(m->lpd_obd);
LASSERTF(rc == 0, "error %d\n", rc);