static int llog_client_create(struct llog_ctxt *ctxt, struct llog_handle **res,
struct llog_logid *logid, char *name)
{
- struct obd_import *imp;
- struct llogd_body req_body;
- struct llogd_body *body;
- struct llog_handle *handle;
+ struct obd_import *imp;
+ struct llogd_body *body;
+ struct llog_handle *handle;
struct ptlrpc_request *req = NULL;
- int size[3] = { sizeof(struct ptlrpc_body), sizeof(req_body) };
- char *bufs[3] = { NULL, (char*)&req_body };
- int bufcount = 2;
- int rc;
+ int rc;
ENTRY;
if (ctxt->loc_imp == NULL) {
RETURN(-ENOMEM);
*res = handle;
- memset(&req_body, 0, sizeof(req_body));
+ req = ptlrpc_request_alloc(imp, &RQF_LLOG_ORIGIN_HANDLE_CREATE);
+ if (req == NULL)
+ GOTO(err_free, rc = -ENOMEM);
+
+ if (name)
+ req_capsule_set_size(&req->rq_pill, &RMF_NAME, RCL_CLIENT,
+ strlen(name) + 1);
+
+ rc = ptlrpc_request_pack(req, LUSTRE_LOG_VERSION,
+ LLOG_ORIGIN_HANDLE_CREATE);
+ if (rc) {
+ ptlrpc_request_free(req);
+ GOTO(err_free, rc);
+ }
+ ptlrpc_request_set_replen(req);
+
+ body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
if (logid)
- req_body.lgd_logid = *logid;
- req_body.lgd_ctxt_idx = ctxt->loc_idx - 1;
+ body->lgd_logid = *logid;
+ body->lgd_ctxt_idx = ctxt->loc_idx - 1;
if (name) {
- size[bufcount] = strlen(name) + 1;
- bufs[bufcount] = name;
- bufcount++;
+ char *tmp;
+ tmp = req_capsule_client_sized_get(&req->rq_pill, &RMF_NAME,
+ strlen(name) + 1);
+ LASSERT(tmp);
+ strcpy(tmp, name);
}
- req = ptlrpc_prep_req(imp, LUSTRE_LOG_VERSION,
- LLOG_ORIGIN_HANDLE_CREATE, bufcount, size, bufs);
- if (!req)
- GOTO(err_free, rc = -ENOMEM);
-
- ptlrpc_req_set_repsize(req, 2, size);
rc = ptlrpc_queue_wait(req);
if (rc)
GOTO(err_free, rc);
- body = lustre_swab_repbuf(req, REPLY_REC_OFF, sizeof(*body),
- lustre_swab_llogd_body);
- if (body == NULL) {
- CERROR ("Can't unpack llogd_body\n");
+ body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
+ if (body == NULL)
GOTO(err_free, rc =-EFAULT);
- }
handle->lgh_id = body->lgd_logid;
handle->lgh_ctxt = ctxt;
-
+ EXIT;
out:
- if (req)
- ptlrpc_req_finished(req);
- RETURN(rc);
-
+ ptlrpc_req_finished(req);
+ return rc;
err_free:
llog_free_handle(handle);
goto out;
static int llog_client_destroy(struct llog_handle *loghandle)
{
- struct obd_import *imp = loghandle->lgh_ctxt->loc_imp;
struct ptlrpc_request *req = NULL;
- struct llogd_body *body;
- int size[] = { sizeof(struct ptlrpc_body), sizeof(*body) };
- int rc;
+ struct llogd_body *body;
+ int rc;
ENTRY;
- req = ptlrpc_prep_req(imp, LUSTRE_LOG_VERSION,
- LLOG_ORIGIN_HANDLE_DESTROY, 2, size, NULL);
- if (!req)
+ req = ptlrpc_request_alloc_pack(loghandle->lgh_ctxt->loc_imp,
+ &RQF_LLOG_ORIGIN_HANDLE_DESTROY,
+ LUSTRE_LOG_VERSION,
+ LLOG_ORIGIN_HANDLE_DESTROY);
+ if (req == NULL)
RETURN(-ENOMEM);
- body = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF, sizeof(*body));
+ body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
body->lgd_logid = loghandle->lgh_id;
body->lgd_llh_flags = loghandle->lgh_hdr->llh_flags;
- ptlrpc_req_set_repsize(req, 2, size);
+ ptlrpc_request_set_replen(req);
rc = ptlrpc_queue_wait(req);
ptlrpc_req_finished(req);
int *cur_idx, int next_idx,
__u64 *cur_offset, void *buf, int len)
{
- struct obd_import *imp = loghandle->lgh_ctxt->loc_imp;
struct ptlrpc_request *req = NULL;
- struct llogd_body *body;
- void * ptr;
- int size[3] = { sizeof(struct ptlrpc_body), sizeof(*body) };
- int rc;
+ struct llogd_body *body;
+ void *ptr;
+ int rc;
ENTRY;
- req = ptlrpc_prep_req(imp, LUSTRE_LOG_VERSION,
- LLOG_ORIGIN_HANDLE_NEXT_BLOCK, 2, size, NULL);
- if (!req)
- GOTO(out, rc = -ENOMEM);
+ req = ptlrpc_request_alloc_pack(loghandle->lgh_ctxt->loc_imp,
+ &RQF_LLOG_ORIGIN_HANDLE_NEXT_BLOCK,
+ LUSTRE_LOG_VERSION,
+ LLOG_ORIGIN_HANDLE_NEXT_BLOCK);
+ if (req == NULL)
+ RETURN(-ENOMEM);
- body = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF, sizeof(*body));
+ body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
body->lgd_logid = loghandle->lgh_id;
body->lgd_ctxt_idx = loghandle->lgh_ctxt->loc_idx - 1;
body->lgd_llh_flags = loghandle->lgh_hdr->llh_flags;
body->lgd_len = len;
body->lgd_cur_offset = *cur_offset;
- size[REPLY_REC_OFF + 1] = len;
- ptlrpc_req_set_repsize(req, 3, size);
+ req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER, len);
+ ptlrpc_request_set_replen(req);
rc = ptlrpc_queue_wait(req);
if (rc)
GOTO(out, rc);
- body = lustre_swab_repbuf(req, REPLY_REC_OFF, sizeof(*body),
- lustre_swab_llogd_body);
- if (body == NULL) {
- CERROR ("Can't unpack llogd_body\n");
+ body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
+ if (body == NULL)
GOTO(out, rc =-EFAULT);
- }
/* The log records are swabbed as they are processed */
- ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF + 1, len);
- if (ptr == NULL) {
- CERROR ("Can't unpack bitmap\n");
+ ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);
+ if (ptr == NULL)
GOTO(out, rc =-EFAULT);
- }
*cur_idx = body->lgd_saved_index;
*cur_offset = body->lgd_cur_offset;
memcpy(buf, ptr, len);
-
+ EXIT;
out:
- if (req)
- ptlrpc_req_finished(req);
- RETURN(rc);
+ ptlrpc_req_finished(req);
+ return rc;
}
static int llog_client_prev_block(struct llog_handle *loghandle,
int prev_idx, void *buf, int len)
{
- struct obd_import *imp = loghandle->lgh_ctxt->loc_imp;
struct ptlrpc_request *req = NULL;
- struct llogd_body *body;
- void * ptr;
- int size[3] = { sizeof(struct ptlrpc_body), sizeof(*body) };
- int rc;
+ struct llogd_body *body;
+ void *ptr;
+ int rc;
ENTRY;
- req = ptlrpc_prep_req(imp, LUSTRE_LOG_VERSION,
- LLOG_ORIGIN_HANDLE_PREV_BLOCK, 2, size, NULL);
- if (!req)
- GOTO(out, rc = -ENOMEM);
+ req = ptlrpc_request_alloc_pack(loghandle->lgh_ctxt->loc_imp,
+ &RQF_LLOG_ORIGIN_HANDLE_PREV_BLOCK,
+ LUSTRE_LOG_VERSION,
+ LLOG_ORIGIN_HANDLE_PREV_BLOCK);
+ if (req == NULL)
+ RETURN(-ENOMEM);
- body = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF, sizeof(*body));
+ body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
body->lgd_logid = loghandle->lgh_id;
body->lgd_ctxt_idx = loghandle->lgh_ctxt->loc_idx - 1;
body->lgd_llh_flags = loghandle->lgh_hdr->llh_flags;
body->lgd_index = prev_idx;
body->lgd_len = len;
- size[REPLY_REC_OFF + 1] = len;
- ptlrpc_req_set_repsize(req, 3, size);
+ req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER, len);
+ ptlrpc_request_set_replen(req);
+
rc = ptlrpc_queue_wait(req);
if (rc)
GOTO(out, rc);
- body = lustre_swab_repbuf(req, REPLY_REC_OFF, sizeof(*body),
- lustre_swab_llogd_body);
- if (body == NULL) {
- CERROR ("Can't unpack llogd_body\n");
+ body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
+ if (body == NULL)
GOTO(out, rc =-EFAULT);
- }
- ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF + 1, len);
- if (ptr == NULL) {
- CERROR ("Can't unpack bitmap\n");
+ ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);
+ if (ptr == NULL)
GOTO(out, rc =-EFAULT);
- }
memcpy(buf, ptr, len);
-
+ EXIT;
out:
- if (req)
- ptlrpc_req_finished(req);
- RETURN(rc);
+ ptlrpc_req_finished(req);
+ return rc;
}
static int llog_client_read_header(struct llog_handle *handle)
{
- struct obd_import *imp = handle->lgh_ctxt->loc_imp;
struct ptlrpc_request *req = NULL;
- struct llogd_body *body;
- struct llog_log_hdr *hdr;
- struct llog_rec_hdr *llh_hdr;
- int size[2] = { sizeof(struct ptlrpc_body), sizeof(*body) };
- int repsize[2] = { sizeof(struct ptlrpc_body), sizeof(*hdr) };
- int rc;
+ struct llogd_body *body;
+ struct llog_log_hdr *hdr;
+ struct llog_rec_hdr *llh_hdr;
+ int rc;
ENTRY;
- req = ptlrpc_prep_req(imp, LUSTRE_LOG_VERSION,
- LLOG_ORIGIN_HANDLE_READ_HEADER, 2, size, NULL);
- if (!req)
- GOTO(out, rc = -ENOMEM);
+ req = ptlrpc_request_alloc_pack(handle->lgh_ctxt->loc_imp,
+ &RQF_LLOG_ORIGIN_HANDLE_READ_HEADER,
+ LUSTRE_LOG_VERSION,
+ LLOG_ORIGIN_HANDLE_READ_HEADER);
+ if (req == NULL)
+ RETURN(-ENOMEM);
- body = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF, sizeof(*body));
+ body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
body->lgd_logid = handle->lgh_id;
body->lgd_ctxt_idx = handle->lgh_ctxt->loc_idx - 1;
body->lgd_llh_flags = handle->lgh_hdr->llh_flags;
- ptlrpc_req_set_repsize(req, 2, repsize);
+ ptlrpc_request_set_replen(req);
rc = ptlrpc_queue_wait(req);
if (rc)
GOTO(out, rc);
- hdr = lustre_swab_repbuf(req, REPLY_REC_OFF, sizeof(*hdr),
- lustre_swab_llog_hdr);
- if (hdr == NULL) {
- CERROR ("Can't unpack llog_hdr\n");
+ hdr = req_capsule_server_get(&req->rq_pill, &RMF_LLOG_LOG_HDR);
+ if (hdr == NULL)
GOTO(out, rc =-EFAULT);
- }
memcpy(handle->lgh_hdr, hdr, sizeof (*hdr));
handle->lgh_last_idx = handle->lgh_hdr->llh_tail.lrt_index;
CERROR("you may need to re-run lconf --write_conf.\n");
rc = -EIO;
}
-
+ EXIT;
out:
- if (req)
- ptlrpc_req_finished(req);
- RETURN(rc);
+ ptlrpc_req_finished(req);
+ return rc;
}
static int llog_client_close(struct llog_handle *handle)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff