start = str;
if (start[0] == '[') {
struct lu_fid *fid = &logid->lgl_oi.oi_fid;
+ struct lu_fid sfid;
int num;
fid_zero(fid);
logid->lgl_ogen = 0;
num = sscanf(start + 1, SFID, RFID(fid));
CDEBUG(D_INFO, DFID":%x\n", PFID(fid), logid->lgl_ogen);
- RETURN(num == 3 && fid_is_sane(fid) ? 0 : -EINVAL);
+ logid_to_fid(logid, &sfid);
+ RETURN(num == 3 && fid_is_sane(&sfid) ? 0 : -EINVAL);
}
#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 1, 53, 0)
RETURN(rc);
}
rc = llog_process(env, loghandle, llog_check_cb, NULL, NULL);
- llog_handle_put(loghandle);
+ llog_handle_put(env, loghandle);
} else {
bool ok;
}
llog_cat_cleanup(env, cat, log, log->u.phd.phd_cookie.lgc_index);
out:
- llog_handle_put(log);
+ llog_handle_put(env, log);
RETURN(rc);
}
out = data->ioc_bulk;
remains = data->ioc_inllen1;
- for (i = 0; i < count; i++) {
+ /* OBD_FAIL: fetch the catalog records from the specified one */
+ if (OBD_FAIL_CHECK(OBD_FAIL_CATLIST))
+ data->ioc_count = cfs_fail_val - 1;
+ for (i = data->ioc_count; i < count; i++) {
id = &idarray[i].lci_logid;
l = snprintf(out, remains, "catalog_log: "DFID":%x\n",
- PFID(&id->lgl_oi.oi_fid), id->lgl_ogen);
+ PFID(&id->lgl_oi.oi_fid), id->lgl_ogen);
out += l;
remains -= l;
- if (remains <= 0)
- break;
+ if (remains <= 0) {
+ if (remains < 0) {
+ /* the print is not complete */
+ remains += l;
+ data->ioc_bulk[out - data->ioc_bulk - l] = '\0';
+ data->ioc_count = i;
+ } else {
+ data->ioc_count = i++;
+ }
+ goto out;
+ }
}
+ data->ioc_count = 0;
out:
OBD_FREE_LARGE(idarray, size);
RETURN(rc);