struct llog_mini_rec {
struct llog_rec_hdr lmr_hdr;
- __u32 padding[2];
struct llog_rec_tail lmr_tail;
} __attribute__((packed));
int rc2;
ENTRY;
- CERROR("1a: create a log with name: %s\n", name);
+ CWARN("1a: create a log with name: %s\n", name);
LASSERT(ctxt);
rc = llog_create(ctxt, &llh, NULL, name);
GOTO(out, rc);
out:
- CERROR("1b: close newly-created log\n");
+ CWARN("1b: close newly-created log\n");
rc2 = llog_close(llh);
if (rc2) {
CERROR("1b: close log %s failed: %d\n", name, rc2);
struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
ENTRY;
- CERROR("2a: re-open a log with name: %s\n", name);
+ CWARN("2a: re-open a log with name: %s\n", name);
rc = llog_create(ctxt, llh, NULL, name);
if (rc) {
CERROR("2a: re-open log with name %s failed: %d\n", name, rc);
if ((rc = verify_handle("2", *llh, 1)))
RETURN(rc);
- CERROR("2b: create a log without specified NAME & LOGID\n");
+ CWARN("2b: create a log without specified NAME & LOGID\n");
rc = llog_create(ctxt, &loghandle, NULL, NULL);
if (rc) {
CERROR("2b: create log failed\n");
logid = loghandle->lgh_id;
llog_close(loghandle);
- CERROR("2b: re-open the log by LOGID\n");
+ CWARN("2b: re-open the log by LOGID\n");
rc = llog_create(ctxt, &loghandle, &logid, NULL);
if (rc) {
CERROR("2b: re-open log by LOGID failed\n");
}
llog_init_handle(loghandle, LLOG_F_IS_PLAIN, &uuid);
- CERROR("2b: destroy this log\n");
+ CWARN("2b: destroy this log\n");
rc = llog_destroy(loghandle);
if (rc) {
CERROR("2b: destroy log failed\n");
lcr.lcr_hdr.lrh_len = lcr.lcr_tail.lrt_len = cpu_to_le32(sizeof(lcr));
lcr.lcr_hdr.lrh_type = cpu_to_le32(OST_SZ_REC);
- CERROR("3a: write one create_rec\n");
+ CWARN("3a: write one create_rec\n");
rc = llog_write_rec(llh, &lcr.lcr_hdr, NULL, 0, NULL, -1);
num_recs++;
if (rc) {
if ((rc = verify_handle("3a", llh, num_recs)))
RETURN(rc);
- CERROR("3b: write 10 cfg log records with 8 bytes bufs\n");
+ CWARN("3b: write 10 cfg log records with 8 bytes bufs\n");
for (i = 0; i < 10; i++) {
struct llog_rec_hdr hdr;
char buf[8];
if ((rc = verify_handle("3b", llh, num_recs)))
RETURN(rc);
- CERROR("3c: write 1000 more log records\n");
+ CWARN("3c: write 1000 more log records\n");
for (i = 0; i < 1000; i++) {
rc = llog_write_rec(llh, &lcr.lcr_hdr, NULL, 0, NULL, -1);
if (rc) {
lmr.lmr_hdr.lrh_type = cpu_to_le32(0xf00f00);
sprintf(name, "%x", llog_test_rand+1);
- CERROR("4a: create a catalog log with name: %s\n", name);
+ CWARN("4a: create a catalog log with name: %s\n", name);
rc = llog_create(ctxt, &cath, NULL, name);
if (rc) {
CERROR("1a: llog_create with name %s failed: %d\n", name, rc);
num_recs++;
cat_logid = cath->lgh_id;
- CERROR("4b: write 1 record into the catalog\n");
+ CWARN("4b: write 1 record into the catalog\n");
rc = llog_cat_add_rec(cath, &lmr.lmr_hdr, &cookie, NULL);
if (rc != 1) {
CERROR("4b: write 1 catalog record failed at: %d\n", rc);
if ((rc = verify_handle("4b", cath->u.chd.chd_current_log, num_recs)))
RETURN(rc);
- CERROR("4c: cancel 1 log record\n");
+ CWARN("4c: cancel 1 log record\n");
rc = llog_cat_cancel_records(cath, 1, &cookie);
if (rc) {
CERROR("4c: cancel 1 catalog based record failed: %d\n", rc);
if ((rc = verify_handle("4c", cath->u.chd.chd_current_log, num_recs)))
RETURN(rc);
- CERROR("4d: write 40,000 more log records\n");
+ 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);
if (rc) {
num_recs++;
}
- CERROR("4e: add 5 large records, one record per block\n");
+ CWARN("4e: add 5 large records, one record per block\n");
buflen = LLOG_CHUNK_SIZE - sizeof(struct llog_rec_hdr)
- sizeof(struct llog_rec_tail);
OBD_ALLOC(buf, buflen);
OBD_FREE(buf, buflen);
out:
- CERROR("4f: put newly-created catalog\n");
+ CWARN("4f: put newly-created catalog\n");
rc = llog_cat_put(cath);
if (rc)
CERROR("1b: close log %s failed: %d\n", name, rc);
RETURN(-EINVAL);
}
- CERROR("seeing record at index %d - "LPX64":%x in log "LPX64"\n",
+ CWARN("seeing record at index %d - "LPX64":%x in log "LPX64"\n",
le32_to_cpu(rec->lrh_index), lir->lid_id.lgl_oid,
lir->lid_id.lgl_ogen, llh->lgh_id.lgl_oid);
RETURN(0);
static int plain_print_cb(struct llog_handle *llh, struct llog_rec_hdr *rec,
void *data)
{
- if (!le32_to_cpu(llh->lgh_hdr->llh_flags) & LLOG_F_IS_PLAIN) {
+ if (!(le32_to_cpu(llh->lgh_hdr->llh_flags) & LLOG_F_IS_PLAIN)) {
CERROR("log is not plain\n");
RETURN(-EINVAL);
}
- CERROR("seeing record at index %d in log "LPX64"\n",
+ CWARN("seeing record at index %d in log "LPX64"\n",
le32_to_cpu(rec->lrh_index), llh->lgh_id.lgl_oid);
RETURN(0);
}
struct llog_cookie cookie;
static int i = 0;
- if (!le32_to_cpu(llh->lgh_hdr->llh_flags) & LLOG_F_IS_PLAIN) {
+ if (!(le32_to_cpu(llh->lgh_hdr->llh_flags) & LLOG_F_IS_PLAIN)) {
CERROR("log is not plain\n");
RETURN(-EINVAL);
}
cpu_to_le32(LLOG_MIN_REC_SIZE);
lmr.lmr_hdr.lrh_type = cpu_to_le32(0xf00f00);
- CERROR("5a: re-open catalog by id\n");
+ CWARN("5a: re-open catalog by id\n");
rc = llog_create(ctxt, &llh, &cat_logid, NULL);
if (rc) {
CERROR("5a: llog_create with logid failed: %d\n", rc);
}
llog_init_handle(llh, LLOG_F_IS_CAT, &uuid);
- CERROR("5b: print the catalog entries.. we expect 2\n");
- rc = llog_process(llh, (llog_cb_t)cat_print_cb, "test 5");
+ CWARN("5b: print the catalog entries.. we expect 2\n");
+ rc = llog_process(llh, (llog_cb_t)cat_print_cb, "test 5", NULL);
if (rc) {
CERROR("5b: process with cat_print_cb failed: %d\n", rc);
GOTO(out, rc);
}
- CERROR("5c: Cancel 40000 records, see one log zapped\n");
+ CWARN("5c: Cancel 40000 records, see one log zapped\n");
rc = llog_cat_process(llh, llog_cancel_rec_cb, "foobar");
if (rc != -4711) {
CERROR("5c: process with cat_cancel_cb failed: %d\n", rc);
GOTO(out, rc);
}
- CERROR("5d: add 1 record to the log with many canceled empty pages\n");
+ 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);
if (rc) {
CERROR("5d: add record to the log with many canceled empty\
GOTO(out, rc);
}
- CERROR("5b: print the catalog entries.. we expect 1\n");
- rc = llog_process(llh, (llog_cb_t)cat_print_cb, "test 5");
+ CWARN("5b: print the catalog entries.. we expect 1\n");
+ rc = llog_process(llh, (llog_cb_t)cat_print_cb, "test 5", NULL);
if (rc) {
CERROR("5b: process with cat_print_cb failed: %d\n", rc);
GOTO(out, rc);
}
- CERROR("5e: print plain log entries.. expect 6\n");
+ CWARN("5e: print plain log entries.. expect 6\n");
rc = llog_cat_process(llh, plain_print_cb, "foobar");
if (rc) {
CERROR("5e: process with plain_print_cb failed: %d\n", rc);
}
out:
- CERROR("5: close re-opened catalog\n");
+ CWARN("5: close re-opened catalog\n");
if (llh)
rc = llog_cat_put(llh);
if (rc)
struct llog_ctxt *nctxt;
int rc;
- CERROR("6a: re-open log %s using client API\n", name);
+ 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) {
CERROR("6: no MDC devices connected to %s found.\n",
GOTO(parse_out, rc);
}
- rc = llog_process(llh, (llog_cb_t)plain_print_cb, NULL);
+ rc = llog_process(llh, (llog_cb_t)plain_print_cb, NULL, NULL);
if (rc)
CERROR("6: llog_process failed %d\n", rc);
RETURN(rc);
}
+static struct lprocfs_vars lprocfs_ost_obd_vars[] = { {0} };
+static struct lprocfs_vars lprocfs_ost_module_vars[] = { {0} };
+LPROCFS_INIT_VARS(ost, lprocfs_ost_module_vars, lprocfs_ost_obd_vars)
+
static int llog_test_attach(struct obd_device *dev, obd_count len, void *data)
{
struct lprocfs_static_vars lvars;
};
+static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
+static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
+LPROCFS_INIT_VARS(llog_test, lprocfs_module_vars, lprocfs_obd_vars)
+
static int __init llog_test_init(void)
{
struct lprocfs_static_vars lvars;
- lprocfs_init_multi_vars(0, &lvars);
+ lprocfs_init_vars(llog_test, &lvars);
return class_register_type(&llog_obd_ops,lvars.module_vars,"llog_test");
}