#include <linux/obd_class.h>
#include <linux/lustre_log.h>
#include <linux/lustre_net.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/lustre_fsfilt.h>
#ifdef __KERNEL__
-int llog_origin_handle_create(struct ptlrpc_request *req)
+int llog_origin_handle_open(struct ptlrpc_request *req)
{
struct obd_export *exp = req->rq_export;
struct obd_device *obd = exp->exp_obd;
struct lvfs_run_ctxt saved;
struct llog_logid *logid = NULL;
struct llog_ctxt *ctxt;
- char * name = NULL;
- int size = sizeof (*body);
- int rc, rc2;
+ char *name = NULL;
+ int rc, rc2, size = sizeof (*body);
ENTRY;
body = lustre_swab_reqbuf(req, 0, sizeof(*body),
- lustre_swab_llogd_body);
+ lustre_swab_llogd_body);
if (body == NULL) {
CERROR ("Can't unpack llogd_body\n");
GOTO(out, rc =-EFAULT);
}
}
- ctxt = llog_get_context(obd, body->lgd_ctxt_idx);
- LASSERT(ctxt != NULL);
+ ctxt = llog_get_context(&obd->obd_llogs, body->lgd_ctxt_idx);
+ if (ctxt == NULL)
+ GOTO(out, rc = -EINVAL);
+
push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
- rc = llog_create(ctxt, &loghandle, logid, name);
+ rc = llog_open(ctxt, &loghandle, logid, name, body->lgd_llh_flags);
if (rc)
GOTO(out_pop, rc);
if (rc)
GOTO(out_close, rc = -ENOMEM);
- body = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*body));
+ body = lustre_msg_buf(req->rq_repmsg, 0, sizeof(*body));
body->lgd_logid = loghandle->lgh_id;
out_close:
if (!buf)
GOTO(out, rc = -ENOMEM);
- ctxt = llog_get_context(obd, body->lgd_ctxt_idx);
- LASSERT(ctxt != NULL);
+ ctxt = llog_get_context(&obd->obd_llogs, body->lgd_ctxt_idx);
+ if (ctxt == NULL)
+ GOTO(out, rc = -EINVAL);
push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
- rc = llog_create(ctxt, &loghandle, &body->lgd_logid, NULL);
+ rc = llog_open(ctxt, &loghandle, &body->lgd_logid, NULL, 0);
if (rc)
GOTO(out_pop, rc);
if (!buf)
GOTO(out, rc = -ENOMEM);
- ctxt = llog_get_context(obd, body->lgd_ctxt_idx);
- LASSERT(ctxt != NULL);
+ ctxt = llog_get_context(&obd->obd_llogs, body->lgd_ctxt_idx);
+ if (ctxt == NULL)
+ GOTO(out, rc = -EINVAL);
push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
- rc = llog_create(ctxt, &loghandle, &body->lgd_logid, NULL);
+ rc = llog_open(ctxt, &loghandle, &body->lgd_logid, NULL, 0);
if (rc)
GOTO(out_pop, rc);
GOTO(out_close, rc);
memset(buf, 0, LLOG_CHUNK_SIZE);
- rc = llog_next_block(loghandle, &body->lgd_saved_index,
- body->lgd_index,
- &body->lgd_cur_offset, buf, LLOG_CHUNK_SIZE);
+ rc = llog_next_block(loghandle, (int *)&body->lgd_saved_index,
+ body->lgd_index, &body->lgd_cur_offset,
+ buf, LLOG_CHUNK_SIZE);
if (rc)
GOTO(out_close, rc);
GOTO(out, rc =-EFAULT);
}
- ctxt = llog_get_context(obd, body->lgd_ctxt_idx);
- LASSERT(ctxt != NULL);
+ ctxt = llog_get_context(&obd->obd_llogs, body->lgd_ctxt_idx);
+ if (ctxt == NULL)
+ GOTO(out, rc = -EINVAL);
push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
- rc = llog_create(ctxt, &loghandle, &body->lgd_logid, NULL);
+ rc = llog_open(ctxt, &loghandle, &body->lgd_logid, NULL, 0);
if (rc)
GOTO(out_pop, rc);
RETURN(-EFAULT);
}
- ctxt = llog_get_context(obd, logcookies->lgc_subsys);
+ ctxt = llog_get_context(&obd->obd_llogs, logcookies->lgc_subsys);
if (ctxt == NULL) {
CWARN("llog subsys not setup or already cleanup\n");
RETURN(-ENOENT);
char *client)
{
struct mds_obd *mds = &obd->u.mds;
- struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT);
+ struct llog_ctxt *ctxt;
struct lvfs_run_ctxt saved;
struct llog_handle *handle = NULL;
char name[4][64];
int rc, i, l, remains = buf_len;
char *out = buf;
+ ctxt = llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT);
if (ctxt == NULL || mds == NULL)
RETURN(-EOPNOTSUPP);
for (i = 0; i < 4; i++) {
int index, uncanceled = 0;
- rc = llog_create(ctxt, &handle, NULL, name[i]);
+ rc = llog_open(ctxt, &handle, NULL, name[i], 0);
if (rc)
GOTO(out_pop, rc);
rc = llog_init_handle(handle, 0, NULL);
lir = (struct llog_logid_rec *)rec;
logid = &lir->lid_id;
- rc = llog_create(ctxt, &handle, logid, NULL);
+ rc = llog_open(ctxt, &handle, logid, NULL, 0);
if (rc)
RETURN(-EINVAL);
rc = llog_init_handle(handle, 0, NULL);
char name[32] = CATLIST;
int rc;
struct cb_data data;
- struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT);
+ struct llog_ctxt *ctxt = llog_get_context(&obd->obd_llogs,
+ LLOG_CONFIG_ORIG_CTXT);
if (ctxt == NULL || mds == NULL)
RETURN(-EOPNOTSUPP);
- count = mds->mds_lov_desc.ld_tgt_count;
+ count = mds->mds_dt_desc.ld_tgt_count;
size = sizeof(*idarray) * count;
OBD_ALLOC(idarray, size);
int l, index, uncanceled = 0;
id = &idarray[i].lci_logid;
- rc = llog_create(ctxt, &handle, id, NULL);
+ rc = llog_open(ctxt, &handle, id, NULL, 0);
if (rc)
GOTO(out_pop, rc);
rc = llog_init_handle(handle, 0, NULL);
}
#else /* !__KERNEL__ */
-int llog_origin_handle_create(struct ptlrpc_request *req)
+int llog_origin_handle_open(struct ptlrpc_request *req)
{
LBUG();
return 0;