static int llog_test_1(struct obd_device *obd, char *name)
{
struct llog_handle *llh;
- struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
+ struct llog_ctxt *ctxt;
int rc;
int rc2;
ENTRY;
CWARN("1a: create a log with name: %s\n", name);
+ ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
LASSERT(ctxt);
- rc = llog_create(ctxt, &llh, NULL, name);
+ rc = llog_open(ctxt, &llh, NULL, name, OBD_LLOG_FL_CREATE);
if (rc) {
- CERROR("1a: llog_create with name %s failed: %d\n", name, rc);
+ CERROR("1a: llog_open with name %s failed: %d\n", name, rc);
RETURN(rc);
}
llog_init_handle(llh, LLOG_F_IS_PLAIN, &uuid);
struct llog_handle *loghandle;
struct llog_logid logid;
int rc;
- struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
+ struct llog_ctxt *ctxt;
ENTRY;
+ ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
CWARN("2a: re-open a log with name: %s\n", name);
- rc = llog_create(ctxt, llh, NULL, name);
+ rc = llog_open(ctxt, llh, NULL, name, 0);
if (rc) {
CERROR("2a: re-open log with name %s failed: %d\n", name, rc);
RETURN(rc);
RETURN(rc);
CWARN("2b: create a log without specified NAME & LOGID\n");
- rc = llog_create(ctxt, &loghandle, NULL, NULL);
+ rc = llog_open(ctxt, &loghandle, NULL, NULL, OBD_LLOG_FL_CREATE);
if (rc) {
CERROR("2b: create log failed\n");
RETURN(rc);
llog_close(loghandle);
CWARN("2b: re-open the log by LOGID\n");
- rc = llog_create(ctxt, &loghandle, &logid, NULL);
+ rc = llog_open(ctxt, &loghandle, &logid, NULL, 0);
if (rc) {
CERROR("2b: re-open log by LOGID failed\n");
RETURN(rc);
int rc, i, buflen;
struct llog_mini_rec lmr;
struct llog_cookie cookie;
- struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
+ struct llog_ctxt *ctxt;
int num_recs = 0;
char *buf;
struct llog_rec_hdr rec;
-
ENTRY;
+ ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
lmr.lmr_hdr.lrh_len = lmr.lmr_tail.lrt_len = LLOG_MIN_REC_SIZE;
lmr.lmr_hdr.lrh_type = 0xf00f00;
sprintf(name, "%x", llog_test_rand+1);
CWARN("4a: create a catalog log with name: %s\n", name);
- rc = llog_create(ctxt, &cath, NULL, name);
+ rc = llog_open(ctxt, &cath, NULL, name, OBD_LLOG_FL_CREATE);
if (rc) {
- CERROR("1a: llog_create with name %s failed: %d\n", name, rc);
+ CERROR("1a: llog_open with name %s failed: %d\n", name, rc);
GOTO(out, rc);
}
llog_init_handle(cath, LLOG_F_IS_CAT, &uuid);
cat_logid = cath->lgh_id;
CWARN("4b: write 1 record into the catalog\n");
- rc = llog_cat_add_rec(cath, &lmr.lmr_hdr, &cookie, NULL);
+ rc = llog_cat_add_rec(cath, &lmr.lmr_hdr, &cookie, NULL, NULL, NULL);
if (rc != 1) {
CERROR("4b: write 1 catalog record failed at: %d\n", rc);
GOTO(out, rc);
CWARN("4d: write 40,000 more log records\n");
for (i = 0; i < 40000; i++) {
- rc = llog_cat_add_rec(cath, &lmr.lmr_hdr, NULL, NULL);
+ rc = llog_cat_add_rec(cath, &lmr.lmr_hdr, NULL, NULL, NULL, NULL);
if (rc) {
CERROR("4d: write 40000 records failed at #%d: %d\n",
i + 1, rc);
for (i = 0; i < 5; i++) {
rec.lrh_len = buflen;
rec.lrh_type = OBD_CFG_REC;
- rc = llog_cat_add_rec(cath, &rec, NULL, buf);
+ rc = llog_cat_add_rec(cath, &rec, NULL, buf, NULL, NULL);
if (rc) {
CERROR("4e: write 5 records failed at #%d: %d\n",
i + 1, rc);
char name[10];
int rc;
struct llog_mini_rec lmr;
- struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
-
+ struct llog_ctxt *ctxt;
ENTRY;
+ ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
lmr.lmr_hdr.lrh_len = lmr.lmr_tail.lrt_len = LLOG_MIN_REC_SIZE;
lmr.lmr_hdr.lrh_type = 0xf00f00;
CWARN("5a: re-open catalog by id\n");
- rc = llog_create(ctxt, &llh, &cat_logid, NULL);
+ rc = llog_open(ctxt, &llh, &cat_logid, NULL, 0);
if (rc) {
- CERROR("5a: llog_create with logid failed: %d\n", rc);
+ CERROR("5a: llog_open with logid failed: %d\n", rc);
GOTO(out, rc);
}
llog_init_handle(llh, LLOG_F_IS_CAT, &uuid);
}
CWARN("5d: add 1 record to the log with many canceled empty pages\n");
- rc = llog_cat_add_rec(llh, &lmr.lmr_hdr, NULL, NULL);
+ rc = llog_cat_add_rec(llh, &lmr.lmr_hdr, NULL, NULL, NULL, NULL);
if (rc) {
CERROR("5d: add record to the log with many canceled empty\
pages failed\n");
static int llog_test_6(struct obd_device *obd, char *name)
{
struct obd_device *mdc_obd;
- struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
- struct obd_uuid *mds_uuid = &ctxt->loc_exp->exp_obd->obd_uuid;
+ struct llog_ctxt *ctxt;
+ struct obd_uuid *mds_uuid;
struct lustre_handle exph = {0, };
struct obd_export *exp;
struct obd_uuid uuid = {"LLOG_TEST6_UUID"};
struct llog_ctxt *nctxt;
int rc;
+ ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
+ mds_uuid = &ctxt->loc_exp->exp_obd->obd_uuid;
+
CWARN("6a: re-open log %s using client API\n", name);
mdc_obd = class_find_client_obd(mds_uuid, LUSTRE_MDC_NAME, NULL);
if (mdc_obd == NULL) {
RETURN(-ENOENT);
}
- rc = obd_connect(&exph, mdc_obd, &uuid);
+ rc = obd_connect(&exph, mdc_obd, &uuid, NULL, 0);
if (rc) {
CERROR("6: failed to connect to MDC: %s\n", mdc_obd->obd_name);
RETURN(rc);
}
exp = class_conn2export(&exph);
- nctxt = llog_get_context(mdc_obd, LLOG_CONFIG_REPL_CTXT);
- rc = llog_create(nctxt, &llh, NULL, name);
+ nctxt = llog_get_context(&mdc_obd->obd_llogs, LLOG_CONFIG_REPL_CTXT);
+ rc = llog_open(nctxt, &llh, NULL, name, 0);
if (rc) {
- CERROR("6: llog_create failed %d\n", rc);
+ CERROR("6: llog_open failed %d\n", rc);
RETURN(rc);
}
static int llog_test_7(struct obd_device *obd)
{
- struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
+ struct llog_ctxt *ctxt;
struct llog_handle *llh;
struct llog_create_rec lcr;
char name[10];
int rc;
ENTRY;
+ ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
sprintf(name, "%x", llog_test_rand+2);
CWARN("7: create a log with name: %s\n", name);
LASSERT(ctxt);
- rc = llog_create(ctxt, &llh, NULL, name);
+ rc = llog_open(ctxt, &llh, NULL, name, OBD_LLOG_FL_CREATE);
if (rc) {
- CERROR("7: llog_create with name %s failed: %d\n", name, rc);
+ CERROR("7: llog_open with name %s failed: %d\n", name, rc);
RETURN(rc);
}
llog_init_handle(llh, LLOG_F_IS_PLAIN, &uuid);
* ------------------------------------------------------------------------- */
static int llog_run_tests(struct obd_device *obd)
{
+ struct llog_ctxt *ctxt;
struct llog_handle *llh;
struct lvfs_run_ctxt saved;
- struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
int rc, err, cleanup_phase = 0;
char name[10];
ENTRY;
+ ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
sprintf(name, "%x", llog_test_rand);
push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL);
}
-static int llog_test_llog_init(struct obd_device *obd, struct obd_device *tgt,
- int count, struct llog_catid *logid)
+static int llog_test_llog_init(struct obd_device *obd, struct obd_llogs *llogs,
+ struct obd_device *tgt, int count,
+ struct llog_catid *logid)
{
int rc;
ENTRY;
- rc = obd_llog_setup(obd, LLOG_TEST_ORIG_CTXT, tgt, 0, NULL,
+ rc = obd_llog_setup(obd, llogs, LLOG_TEST_ORIG_CTXT, tgt, 0, NULL,
&llog_lvfs_ops);
RETURN(rc);
}
-static int llog_test_llog_finish(struct obd_device *obd, int count)
+static int llog_test_llog_finish(struct obd_device *obd,
+ struct obd_llogs *llogs, int count)
{
int rc;
ENTRY;
- rc = obd_llog_cleanup(llog_get_context(obd, LLOG_TEST_ORIG_CTXT));
+ rc = obd_llog_cleanup(llog_get_context(llogs, LLOG_TEST_ORIG_CTXT));
RETURN(rc);
}
static int llog_test_cleanup(struct obd_device *obd, int flags)
{
- int rc = obd_llog_finish(obd, 0);
+ int rc = obd_llog_finish(obd, &obd->obd_llogs, 0);
if (rc)
CERROR("failed to llog_test_llog_finish: %d\n", rc);
- lprocfs_obd_cleanup(obd);
-
return rc;
}
static int llog_test_setup(struct obd_device *obd, obd_count len, void *buf)
{
- struct lprocfs_static_vars lvars;
struct lustre_cfg *lcfg = buf;
struct obd_device *tgt;
int rc;
RETURN(-EINVAL);
}
- rc = obd_llog_init(obd, tgt, 0, NULL);
+ rc = obd_llog_init(obd, &obd->obd_llogs, tgt, 0, NULL);
if (rc)
RETURN(rc);
if (rc)
llog_test_cleanup(obd, 0);
+ RETURN(rc);
+}
+
+static int llog_test_attach(struct obd_device *dev, obd_count len, void *data)
+{
+ struct lprocfs_static_vars lvars;
+
lprocfs_init_vars(llog_test, &lvars);
- lprocfs_obd_setup(obd, lvars.obd_vars);
+ return lprocfs_obd_attach(dev, lvars.obd_vars);
+}
- RETURN(rc);
+static int llog_test_detach(struct obd_device *dev)
+{
+ return lprocfs_obd_detach(dev);
}
static struct obd_ops llog_obd_ops = {
.o_owner = THIS_MODULE,
+ .o_attach = llog_test_attach,
+ .o_detach = llog_test_detach,
.o_setup = llog_test_setup,
- .o_cleanup = llog_test_cleanup,
+ .o_cleanup = llog_test_cleanup,
.o_llog_init = llog_test_llog_init,
.o_llog_finish = llog_test_llog_finish,
};
struct lprocfs_static_vars lvars;
lprocfs_init_vars(llog_test, &lvars);
- return class_register_type(&llog_obd_ops,lvars.module_vars,"llog_test");
+
+ return class_register_type(&llog_obd_ops, NULL,
+ lvars.module_vars,
+ "llog_test");
}
static void __exit llog_test_exit(void)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff