#include <lustre_net.h>
#include <libcfs/list.h>
-#define LLOG_CLIENT_ENTRY(ctxt, imp) do { \
+#define LLOG_CLIENT_ENTRY(ctxt, imp) do { \
mutex_down(&ctxt->loc_sem); \
if (ctxt->loc_imp) { \
imp = class_import_get(ctxt->loc_imp); \
mutex_up(&ctxt->loc_sem); \
} while(0)
-#define LLOG_CLIENT_EXIT(ctxt, imp) do { \
- mutex_down(&ctxt->loc_sem); \
- if (ctxt->loc_imp != imp) \
- CWARN("loc_imp has changed from %p to %p", \
- ctxt->loc_imp, imp); \
- class_import_put(imp); \
- mutex_up(&ctxt->loc_sem); \
+#define LLOG_CLIENT_EXIT(ctxt, imp) do { \
+ mutex_down(&ctxt->loc_sem); \
+ if (ctxt->loc_imp != imp) \
+ CWARN("loc_imp has changed from %p to %p\n", \
+ ctxt->loc_imp, imp); \
+ class_import_put(imp); \
+ mutex_up(&ctxt->loc_sem); \
} while(0)
/* This is a callback from the llog_* functions.
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 *body;
- struct llog_handle *handle;
+ struct obd_import *imp;
+ struct llogd_body req_body;
+ struct llogd_body *body;
+ struct llog_handle *handle;
struct ptlrpc_request *req = NULL;
- int rc;
+ __u32 size[3] = { sizeof(struct ptlrpc_body), sizeof(req_body) };
+ char *bufs[3] = { NULL, (char*)&req_body };
+ int bufcount = 2;
+ int rc;
ENTRY;
LLOG_CLIENT_ENTRY(ctxt, imp);
handle = llog_alloc_handle();
if (handle == NULL)
- RETURN(-ENOMEM);
+ GOTO(out, rc = -ENOMEM);
*res = handle;
- 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);
+ memset(&req_body, 0, sizeof(req_body));
if (logid)
- body->lgd_logid = *logid;
- body->lgd_ctxt_idx = ctxt->loc_idx - 1;
+ req_body.lgd_logid = *logid;
+ req_body.lgd_ctxt_idx = ctxt->loc_idx - 1;
if (name) {
- char *tmp;
- tmp = req_capsule_client_sized_get(&req->rq_pill, &RMF_NAME,
- strlen(name) + 1);
- LASSERT(tmp);
- strcpy(tmp, name);
+ size[bufcount] = strlen(name) + 1;
+ bufs[bufcount] = name;
+ bufcount++;
}
+ 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 = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
- if (body == NULL)
+ body = lustre_swab_repbuf(req, REPLY_REC_OFF, sizeof(*body),
+ lustre_swab_llogd_body);
+ if (body == NULL) {
+ CERROR ("Can't unpack llogd_body\n");
GOTO(err_free, rc =-EFAULT);
+ }
handle->lgh_id = body->lgd_logid;
handle->lgh_ctxt = ctxt;
- EXIT;
+
out:
+ if (req)
+ ptlrpc_req_finished(req);
LLOG_CLIENT_EXIT(ctxt, imp);
- ptlrpc_req_finished(req);
- return rc;
+ RETURN(rc);
+
err_free:
llog_free_handle(handle);
goto out;
{
struct obd_import *imp;
struct ptlrpc_request *req = NULL;
- struct llogd_body *body;
- int rc;
+ struct llogd_body *body;
+ __u32 size[] = { sizeof(struct ptlrpc_body), sizeof(*body) };
+ int rc;
ENTRY;
LLOG_CLIENT_ENTRY(loghandle->lgh_ctxt, imp);
- req = ptlrpc_request_alloc_pack(imp, &RQF_LLOG_ORIGIN_HANDLE_DESTROY,
- LUSTRE_LOG_VERSION,
- LLOG_ORIGIN_HANDLE_DESTROY);
- if (req == NULL)
- GOTO(err_exit, rc =-ENOMEM);
+ req = ptlrpc_prep_req(imp, LUSTRE_LOG_VERSION,
+ LLOG_ORIGIN_HANDLE_DESTROY, 2, size, NULL);
+ if (!req)
+ GOTO(out, rc = -ENOMEM);
- body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
+ body = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF, sizeof(*body));
body->lgd_logid = loghandle->lgh_id;
body->lgd_llh_flags = loghandle->lgh_hdr->llh_flags;
- ptlrpc_request_set_replen(req);
+ ptlrpc_req_set_repsize(req, 2, size);
rc = ptlrpc_queue_wait(req);
ptlrpc_req_finished(req);
-err_exit:
+out:
LLOG_CLIENT_EXIT(loghandle->lgh_ctxt, imp);
RETURN(rc);
}
int *cur_idx, int next_idx,
__u64 *cur_offset, void *buf, int len)
{
- struct obd_import *imp;
+ struct obd_import *imp;
struct ptlrpc_request *req = NULL;
- struct llogd_body *body;
- void *ptr;
- int rc;
+ struct llogd_body *body;
+ void * ptr;
+ __u32 size[3] = { sizeof(struct ptlrpc_body), sizeof(*body) };
+ int rc;
ENTRY;
LLOG_CLIENT_ENTRY(loghandle->lgh_ctxt, imp);
- req = ptlrpc_request_alloc_pack(imp, &RQF_LLOG_ORIGIN_HANDLE_NEXT_BLOCK,
- LUSTRE_LOG_VERSION,
- LLOG_ORIGIN_HANDLE_NEXT_BLOCK);
- if (req == NULL)
- GOTO(err_exit, rc =-ENOMEM);
-
- body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
+ req = ptlrpc_prep_req(imp, LUSTRE_LOG_VERSION,
+ LLOG_ORIGIN_HANDLE_NEXT_BLOCK, 2, size, NULL);
+ if (!req)
+ GOTO(out, rc =-ENOMEM);
+
+ body = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF, sizeof(*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;
- req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER, len);
- ptlrpc_request_set_replen(req);
+ size[REPLY_REC_OFF + 1] = len;
+ ptlrpc_req_set_repsize(req, 3, size);
rc = ptlrpc_queue_wait(req);
if (rc)
GOTO(out, rc);
- body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
- if (body == NULL)
+ body = lustre_swab_repbuf(req, REPLY_REC_OFF, sizeof(*body),
+ lustre_swab_llogd_body);
+ if (body == NULL) {
+ CERROR ("Can't unpack llogd_body\n");
GOTO(out, rc =-EFAULT);
+ }
/* The log records are swabbed as they are processed */
- ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);
- if (ptr == NULL)
+ ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF + 1, len);
+ if (ptr == NULL) {
+ CERROR ("Can't unpack bitmap\n");
GOTO(out, rc =-EFAULT);
+ }
*cur_idx = body->lgd_saved_index;
*cur_offset = body->lgd_cur_offset;
memcpy(buf, ptr, len);
- EXIT;
+
out:
- ptlrpc_req_finished(req);
-err_exit:
+ if (req)
+ ptlrpc_req_finished(req);
LLOG_CLIENT_EXIT(loghandle->lgh_ctxt, imp);
- return rc;
+ RETURN(rc);
}
static int llog_client_prev_block(struct llog_handle *loghandle,
int prev_idx, void *buf, int len)
{
- struct obd_import *imp;
+ struct obd_import *imp;
struct ptlrpc_request *req = NULL;
- struct llogd_body *body;
- void *ptr;
- int rc;
+ struct llogd_body *body;
+ void * ptr;
+ __u32 size[3] = { sizeof(struct ptlrpc_body), sizeof(*body) };
+ int rc;
ENTRY;
LLOG_CLIENT_ENTRY(loghandle->lgh_ctxt, imp);
- req = ptlrpc_request_alloc_pack(imp, &RQF_LLOG_ORIGIN_HANDLE_PREV_BLOCK,
- LUSTRE_LOG_VERSION,
- LLOG_ORIGIN_HANDLE_PREV_BLOCK);
- if (req == NULL)
- GOTO(err_exit, rc = -ENOMEM);
+ req = ptlrpc_prep_req(imp, LUSTRE_LOG_VERSION,
+ LLOG_ORIGIN_HANDLE_PREV_BLOCK, 2, size, NULL);
+ if (!req)
+ GOTO(out, rc = -ENOMEM);
- body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
+ body = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF, sizeof(*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;
- req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER, len);
- ptlrpc_request_set_replen(req);
-
+ size[REPLY_REC_OFF + 1] = len;
+ ptlrpc_req_set_repsize(req, 3, size);
rc = ptlrpc_queue_wait(req);
if (rc)
GOTO(out, rc);
- body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
- if (body == NULL)
+ body = lustre_swab_repbuf(req, REPLY_REC_OFF, sizeof(*body),
+ lustre_swab_llogd_body);
+ if (body == NULL) {
+ CERROR ("Can't unpack llogd_body\n");
GOTO(out, rc =-EFAULT);
+ }
- ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);
- if (ptr == NULL)
+ ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF + 1, len);
+ if (ptr == NULL) {
+ CERROR ("Can't unpack bitmap\n");
GOTO(out, rc =-EFAULT);
+ }
memcpy(buf, ptr, len);
- EXIT;
+
out:
- ptlrpc_req_finished(req);
-err_exit:
+ if (req)
+ ptlrpc_req_finished(req);
LLOG_CLIENT_EXIT(loghandle->lgh_ctxt, imp);
- return rc;
+ RETURN(rc);
}
static int llog_client_read_header(struct llog_handle *handle)
{
- struct obd_import *imp;
+ struct obd_import *imp;
struct ptlrpc_request *req = NULL;
- struct llogd_body *body;
- struct llog_log_hdr *hdr;
- struct llog_rec_hdr *llh_hdr;
- int rc;
+ struct llogd_body *body;
+ struct llog_log_hdr *hdr;
+ struct llog_rec_hdr *llh_hdr;
+ __u32 size[2] = { sizeof(struct ptlrpc_body), sizeof(*body) };
+ __u32 repsize[2] = { sizeof(struct ptlrpc_body), sizeof(*hdr) };
+ int rc;
ENTRY;
LLOG_CLIENT_ENTRY(handle->lgh_ctxt, imp);
- req = ptlrpc_request_alloc_pack(imp,&RQF_LLOG_ORIGIN_HANDLE_READ_HEADER,
- LUSTRE_LOG_VERSION,
- LLOG_ORIGIN_HANDLE_READ_HEADER);
- if (req == NULL)
- GOTO(err_exit, rc = -ENOMEM);
+ req = ptlrpc_prep_req(imp, LUSTRE_LOG_VERSION,
+ LLOG_ORIGIN_HANDLE_READ_HEADER, 2, size, NULL);
+ if (!req)
+ GOTO(out, rc = -ENOMEM);
- body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
+ body = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF, sizeof(*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_request_set_replen(req);
+ ptlrpc_req_set_repsize(req, 2, repsize);
rc = ptlrpc_queue_wait(req);
if (rc)
GOTO(out, rc);
- hdr = req_capsule_server_get(&req->rq_pill, &RMF_LLOG_LOG_HDR);
- if (hdr == NULL)
+ hdr = lustre_swab_repbuf(req, REPLY_REC_OFF, sizeof(*hdr),
+ lustre_swab_llog_hdr);
+ if (hdr == NULL) {
+ CERROR ("Can't unpack llog_hdr\n");
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:
- ptlrpc_req_finished(req);
-err_exit:
+ if (req)
+ ptlrpc_req_finished(req);
LLOG_CLIENT_EXIT(handle->lgh_ctxt, imp);
- return rc;
+ RETURN(rc);
}
static int llog_client_close(struct llog_handle *handle)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff