X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fllog_server.c;h=d0b618b4c11bc5efa0d51fef1baed246df96627c;hb=2f938e8142ed5c6207dbed0f6f69787c1cf49b74;hp=d4bd4828ee05ec98f404324e936d4455a51d9799;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/llog_server.c b/lustre/ptlrpc/llog_server.c index d4bd482..d0b618b 100644 --- a/lustre/ptlrpc/llog_server.c +++ b/lustre/ptlrpc/llog_server.c @@ -46,41 +46,35 @@ int llog_origin_handle_create(struct ptlrpc_request *req) { - struct obd_export *exp = req->rq_export; - struct obd_device *obd = exp->exp_obd; - struct obd_device *disk_obd; - struct llog_handle *loghandle; - struct llogd_body *body; - struct lvfs_run_ctxt saved; - struct llog_logid *logid = NULL; - struct llog_ctxt *ctxt; - char * name = NULL; - int size[2] = { sizeof(struct ptlrpc_body), sizeof(*body) }; - int rc, rc2; + struct obd_export *exp = req->rq_export; + struct obd_device *obd = exp->exp_obd; + struct obd_device *disk_obd; + struct llog_handle *loghandle; + struct llogd_body *body; + struct lvfs_run_ctxt saved; + struct llog_logid *logid = NULL; + struct llog_ctxt *ctxt; + char *name = NULL; + int rc, rc2; ENTRY; - body = lustre_swab_reqbuf(req, REQ_REC_OFF, sizeof(*body), - lustre_swab_llogd_body); - if (body == NULL) { - CERROR ("Can't unpack llogd_body\n"); - GOTO(out, rc =-EFAULT); - } + body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY); + if (body == NULL) + RETURN(-EFAULT); if (body->lgd_logid.lgl_oid > 0) logid = &body->lgd_logid; - if (lustre_msg_bufcount(req->rq_reqmsg) > 2) { - name = lustre_msg_string(req->rq_reqmsg, REQ_REC_OFF + 1, 0); - if (name == NULL) { - CERROR("Can't unpack name\n"); - GOTO(out, rc = -EFAULT); - } + if (req_capsule_field_present(&req->rq_pill, &RMF_NAME, RCL_CLIENT)) { + name = req_capsule_client_get(&req->rq_pill, &RMF_NAME); + if (name == NULL) + RETURN(-EFAULT); CDEBUG(D_INFO, "opening log %s\n", name); } ctxt = llog_get_context(obd, body->lgd_ctxt_idx); if (ctxt == NULL) - GOTO(out, rc = -EINVAL); + RETURN(-EINVAL); disk_obd = ctxt->loc_exp->exp_obd; push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); @@ -88,11 +82,11 @@ int llog_origin_handle_create(struct ptlrpc_request *req) if (rc) GOTO(out_pop, rc); - rc = lustre_pack_reply(req, 2, size, NULL); + rc = req_capsule_server_pack(&req->rq_pill); if (rc) GOTO(out_close, rc = -ENOMEM); - body = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof(*body)); + body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY); body->lgd_logid = loghandle->lgh_id; out_close: @@ -101,38 +95,35 @@ out_close: rc = rc2; out_pop: pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); -out: + llog_ctxt_put(ctxt); RETURN(rc); } int llog_origin_handle_destroy(struct ptlrpc_request *req) { - struct obd_export *exp = req->rq_export; - struct obd_device *obd = exp->exp_obd; - struct obd_device *disk_obd; - struct llog_handle *loghandle; - struct llogd_body *body; - struct lvfs_run_ctxt saved; - struct llog_logid *logid = NULL; - struct llog_ctxt *ctxt; - int size[] = { sizeof(struct ptlrpc_body), sizeof(*body) }; - int rc; - __u32 flags; + struct obd_export *exp = req->rq_export; + struct obd_device *obd = exp->exp_obd; + struct obd_device *disk_obd; + struct llog_handle *loghandle; + struct llogd_body *body; + struct lvfs_run_ctxt saved; + struct llog_logid *logid = NULL; + struct llog_ctxt *ctxt; + __u32 flags; + int rc; ENTRY; - body = lustre_swab_reqbuf(req, REQ_REC_OFF, sizeof(*body), - lustre_swab_llogd_body); - if (body == NULL) { - CERROR ("Can't unpack llogd_body\n"); - GOTO(out, rc =-EFAULT); - } + body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY); + if (body == NULL) + RETURN(-EFAULT); if (body->lgd_logid.lgl_oid > 0) logid = &body->lgd_logid; ctxt = llog_get_context(obd, body->lgd_ctxt_idx); if (ctxt == NULL) - GOTO(out, rc = -EINVAL); + RETURN(-EINVAL); + disk_obd = ctxt->loc_exp->exp_obd; push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); @@ -140,11 +131,11 @@ int llog_origin_handle_destroy(struct ptlrpc_request *req) if (rc) GOTO(out_pop, rc); - rc = lustre_pack_reply(req, 2, size, NULL); + rc = req_capsule_server_pack(&req->rq_pill); if (rc) GOTO(out_close, rc = -ENOMEM); - body = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof (*body)); + body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY); body->lgd_logid = loghandle->lgh_id; flags = body->lgd_llh_flags; rc = llog_init_handle(loghandle, LLOG_F_IS_PLAIN, NULL); @@ -160,38 +151,33 @@ out_close: llog_close(loghandle); out_pop: pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); -out: + llog_ctxt_put(ctxt); RETURN(rc); } int llog_origin_handle_next_block(struct ptlrpc_request *req) { - struct obd_export *exp = req->rq_export; - struct obd_device *obd = exp->exp_obd; - struct obd_device *disk_obd; + struct obd_export *exp = req->rq_export; + struct obd_device *obd = exp->exp_obd; + struct obd_device *disk_obd; struct llog_handle *loghandle; - struct llogd_body *body; + struct llogd_body *body; + struct llogd_body *repbody; struct lvfs_run_ctxt saved; - struct llog_ctxt *ctxt; - __u32 flags; - __u8 *buf; - void * ptr; - int size[3] = { sizeof(struct ptlrpc_body), - sizeof(*body), - LLOG_CHUNK_SIZE }; - int rc, rc2; + struct llog_ctxt *ctxt; + __u32 flags; + __u8 *buf; + void *ptr; + int rc, rc2; ENTRY; - body = lustre_swab_reqbuf(req, REQ_REC_OFF, sizeof(*body), - lustre_swab_llogd_body); - if (body == NULL) { - CERROR ("Can't unpack llogd_body\n"); - GOTO(out, rc =-EFAULT); - } + body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY); + if (body == NULL) + RETURN(-EFAULT); OBD_ALLOC(buf, LLOG_CHUNK_SIZE); if (!buf) - GOTO(out, rc = -ENOMEM); + RETURN(-ENOMEM); ctxt = llog_get_context(obd, body->lgd_ctxt_idx); if (ctxt == NULL) @@ -215,15 +201,16 @@ int llog_origin_handle_next_block(struct ptlrpc_request *req) if (rc) GOTO(out_close, rc); - - rc = lustre_pack_reply(req, 3, size, NULL); + req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER, + LLOG_CHUNK_SIZE); + rc = req_capsule_server_pack(&req->rq_pill); if (rc) GOTO(out_close, rc = -ENOMEM); - ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof (body)); - memcpy(ptr, body, sizeof(*body)); + repbody = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY); + *repbody = *body; - ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF+1, LLOG_CHUNK_SIZE); + ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA); memcpy(ptr, buf, LLOG_CHUNK_SIZE); out_close: @@ -233,40 +220,35 @@ out_close: out_pop: pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); + llog_ctxt_put(ctxt); out_free: OBD_FREE(buf, LLOG_CHUNK_SIZE); -out: RETURN(rc); } int llog_origin_handle_prev_block(struct ptlrpc_request *req) { - struct obd_export *exp = req->rq_export; - struct obd_device *obd = exp->exp_obd; - struct llog_handle *loghandle; - struct llogd_body *body; - struct obd_device *disk_obd; - struct lvfs_run_ctxt saved; - struct llog_ctxt *ctxt; - __u32 flags; - __u8 *buf; - void * ptr; - int size[] = { sizeof(struct ptlrpc_body), - sizeof(*body), - LLOG_CHUNK_SIZE }; - int rc, rc2; + struct obd_export *exp = req->rq_export; + struct obd_device *obd = exp->exp_obd; + struct llog_handle *loghandle; + struct llogd_body *body; + struct llogd_body *repbody; + struct obd_device *disk_obd; + struct lvfs_run_ctxt saved; + struct llog_ctxt *ctxt; + __u32 flags; + __u8 *buf; + void *ptr; + int rc, rc2; ENTRY; - body = lustre_swab_reqbuf(req, REQ_REC_OFF, sizeof(*body), - lustre_swab_llogd_body); - if (body == NULL) { - CERROR ("Can't unpack llogd_body\n"); - GOTO(out, rc =-EFAULT); - } + body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY); + if (body == NULL) + RETURN(-EFAULT); OBD_ALLOC(buf, LLOG_CHUNK_SIZE); if (!buf) - GOTO(out, rc = -ENOMEM); + RETURN(-ENOMEM); ctxt = llog_get_context(obd, body->lgd_ctxt_idx); LASSERT(ctxt != NULL); @@ -288,15 +270,16 @@ int llog_origin_handle_prev_block(struct ptlrpc_request *req) if (rc) GOTO(out_close, rc); - - rc = lustre_pack_reply(req, 3, size, NULL); + req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER, + LLOG_CHUNK_SIZE); + rc = req_capsule_server_pack(&req->rq_pill); if (rc) GOTO(out_close, rc = -ENOMEM); - ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof(body)); - memcpy(ptr, body, sizeof(*body)); + repbody = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY); + *repbody = *body; - ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF+1, LLOG_CHUNK_SIZE); + ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA); memcpy(ptr, buf, LLOG_CHUNK_SIZE); out_close: @@ -306,36 +289,32 @@ out_close: out_pop: pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); + llog_ctxt_put(ctxt); OBD_FREE(buf, LLOG_CHUNK_SIZE); -out: RETURN(rc); } int llog_origin_handle_read_header(struct ptlrpc_request *req) { - struct obd_export *exp = req->rq_export; - struct obd_device *obd = exp->exp_obd; - struct obd_device *disk_obd; - struct llog_handle *loghandle; - struct llogd_body *body; - struct llog_log_hdr *hdr; - struct lvfs_run_ctxt saved; - struct llog_ctxt *ctxt; - __u32 flags; - int size[2] = { sizeof(struct ptlrpc_body), sizeof(*hdr) }; - int rc, rc2; + struct obd_export *exp = req->rq_export; + struct obd_device *obd = exp->exp_obd; + struct obd_device *disk_obd; + struct llog_handle *loghandle; + struct llogd_body *body; + struct llog_log_hdr *hdr; + struct lvfs_run_ctxt saved; + struct llog_ctxt *ctxt; + __u32 flags; + int rc, rc2; ENTRY; - body = lustre_swab_reqbuf(req, REQ_REC_OFF, sizeof(*body), - lustre_swab_llogd_body); - if (body == NULL) { - CERROR ("Can't unpack llogd_body\n"); - GOTO(out, rc =-EFAULT); - } + body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY); + if (body == NULL) + RETURN(-EFAULT); ctxt = llog_get_context(obd, body->lgd_ctxt_idx); if (ctxt == NULL) - GOTO(out, rc = -EINVAL); + RETURN(-EINVAL); disk_obd = ctxt->loc_exp->exp_obd; push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); @@ -349,22 +328,20 @@ int llog_origin_handle_read_header(struct ptlrpc_request *req) if (rc) GOTO(out_close, rc); - rc = lustre_pack_reply(req, 2, size, NULL); + rc = req_capsule_server_pack(&req->rq_pill); if (rc) GOTO(out_close, rc = -ENOMEM); - hdr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof(*hdr)); - memcpy(hdr, loghandle->lgh_hdr, sizeof(*hdr)); + hdr = req_capsule_server_get(&req->rq_pill, &RMF_LLOG_LOG_HDR); + *hdr = *loghandle->lgh_hdr; out_close: rc2 = llog_close(loghandle); if (!rc) rc = rc2; - out_pop: pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); - -out: + llog_ctxt_put(ctxt); RETURN(rc); } @@ -382,7 +359,7 @@ int llog_origin_handle_cancel(struct ptlrpc_request *req) struct obd_device *obd = req->rq_export->exp_obd; struct obd_device *disk_obd; struct llog_cookie *logcookies; - struct llog_ctxt *ctxt; + struct llog_ctxt *ctxt = NULL; int num_cookies, rc = 0, err, i; struct lvfs_run_ctxt saved; struct llog_handle *cathandle; @@ -390,10 +367,9 @@ int llog_origin_handle_cancel(struct ptlrpc_request *req) void *handle; ENTRY; - logcookies = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF, - sizeof(*logcookies)); - num_cookies = lustre_msg_buflen(req->rq_reqmsg, REQ_REC_OFF) / - sizeof(*logcookies); + logcookies = req_capsule_client_get(&req->rq_pill, &RMF_LOGCOOKIES); + num_cookies = req_capsule_get_size(&req->rq_pill, &RMF_LOGCOOKIES, + RCL_CLIENT) / sizeof(*logcookies); if (logcookies == NULL || num_cookies == 0) { DEBUG_REQ(D_HA, req, "no cookies sent"); RETURN(-EFAULT); @@ -434,8 +410,9 @@ pop_ctxt: if (rc) CERROR("cancel %d llog-records failed: %d\n", num_cookies, rc); else - CDEBUG(D_HA, "cancel %d llog-records\n", num_cookies); + CDEBUG(D_RPCTRACE, "cancel %d llog-records\n", num_cookies); + llog_ctxt_put(ctxt); RETURN(rc); } EXPORT_SYMBOL(llog_origin_handle_cancel); @@ -443,16 +420,16 @@ EXPORT_SYMBOL(llog_origin_handle_cancel); static int llog_catinfo_config(struct obd_device *obd, char *buf, int buf_len, char *client) { - struct mds_obd *mds = &obd->u.mds; - struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_CONFIG_ORIG_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; + struct mds_obd *mds = &obd->u.mds; + struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_CONFIG_ORIG_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; if (ctxt == NULL || mds == NULL) - RETURN(-EOPNOTSUPP); + GOTO(release_ctxt, rc = -EOPNOTSUPP); push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL); @@ -480,7 +457,7 @@ static int llog_catinfo_config(struct obd_device *obd, char *buf, int buf_len, l = snprintf(out, remains, "[Log Name]: %s\nLog Size: %llu\n" "Last Index: %d\nUncanceled Records: %d\n\n", name[i], - handle->lgh_file->f_dentry->d_inode->i_size, + i_size_read(handle->lgh_file->f_dentry->d_inode), handle->lgh_last_idx, uncanceled); out += l; remains -= l; @@ -491,6 +468,8 @@ static int llog_catinfo_config(struct obd_device *obd, char *buf, int buf_len, } out_pop: pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL); +release_ctxt: + llog_ctxt_put(ctxt); RETURN(rc); } @@ -506,7 +485,7 @@ static int llog_catinfo_cb(struct llog_handle *cat, { static char *out = NULL; static int remains = 0; - struct llog_ctxt *ctxt; + struct llog_ctxt *ctxt = NULL; struct llog_handle *handle; struct llog_logid *logid; struct llog_logid_rec *lir; @@ -518,11 +497,13 @@ static int llog_catinfo_cb(struct llog_handle *cat, remains = cbd->remains; cbd->init = 0; } - ctxt = cbd->ctxt; if (!(cat->lgh_hdr->llh_flags & LLOG_F_IS_CAT)) RETURN(-EINVAL); + if (!cbd->ctxt) + RETURN(-EINVAL); + lir = (struct llog_logid_rec *)rec; logid = &lir->lid_id; rc = llog_create(ctxt, &handle, logid, NULL); @@ -541,7 +522,7 @@ static int llog_catinfo_cb(struct llog_handle *cat, "\tLog Size: %llu\n\tLast Index: %d\n" "\tUncanceled Records: %d\n", logid->lgl_oid, logid->lgl_ogr, logid->lgl_ogen, - handle->lgh_file->f_dentry->d_inode->i_size, + i_size_read(handle->lgh_file->f_dentry->d_inode), handle->lgh_last_idx, count); out += l; remains -= l; @@ -567,19 +548,19 @@ static int llog_catinfo_deletions(struct obd_device *obd, char *buf, struct llog_catid *idarray; struct llog_logid *id; char name[32] = CATLIST; - int rc; struct cb_data data; struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT); + int rc; if (ctxt == NULL || mds == NULL) - RETURN(-EOPNOTSUPP); + GOTO(release_ctxt, rc = -EOPNOTSUPP); count = mds->mds_lov_desc.ld_tgt_count; size = sizeof(*idarray) * count; OBD_ALLOC(idarray, size); if (!idarray) - RETURN(-ENOMEM); + GOTO(release_ctxt, rc = -ENOMEM); rc = llog_get_cat_list(obd, obd, name, count, idarray); if (rc) @@ -626,6 +607,9 @@ out_pop: pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL); out_free: OBD_FREE(idarray, size); +release_ctxt: + llog_ctxt_put(ctxt); + RETURN(rc); } @@ -633,39 +617,43 @@ int llog_catinfo(struct ptlrpc_request *req) { struct obd_export *exp = req->rq_export; struct obd_device *obd = exp->exp_obd; - char *keyword; - char *buf, *reply; - int rc, buf_len = LLOG_CHUNK_SIZE; - int size[2] = { sizeof(struct ptlrpc_body), buf_len }; + char *keyword; + char *buf, *reply; + int rc; - OBD_ALLOC(buf, buf_len); + OBD_ALLOC(buf, LLOG_CHUNK_SIZE); if (buf == NULL) return -ENOMEM; - memset(buf, 0, buf_len); + memset(buf, 0, LLOG_CHUNK_SIZE); - keyword = lustre_msg_string(req->rq_reqmsg, REQ_REC_OFF, 0); + keyword = req_capsule_client_get(&req->rq_pill, &RMF_NAME); + LASSERT(keyword); if (strcmp(keyword, "config") == 0) { - char *client = lustre_msg_string(req->rq_reqmsg, - REQ_REC_OFF + 1, 0); - rc = llog_catinfo_config(obd, buf, buf_len, client); + char *client = req_capsule_client_get(&req->rq_pill, + &RMF_STRING); + + LASSERT(client); + rc = llog_catinfo_config(obd, buf, LLOG_CHUNK_SIZE, client); } else if (strcmp(keyword, "deletions") == 0) { - rc = llog_catinfo_deletions(obd, buf, buf_len); + rc = llog_catinfo_deletions(obd, buf, LLOG_CHUNK_SIZE); } else { rc = -EOPNOTSUPP; } - rc = lustre_pack_reply(req, 2, size, NULL); + req_capsule_set_size(&req->rq_pill, &RMF_STRING, RCL_SERVER, + LLOG_CHUNK_SIZE); + rc = req_capsule_server_pack(&req->rq_pill); if (rc) GOTO(out_free, rc = -ENOMEM); - reply = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, buf_len); + reply = req_capsule_server_get(&req->rq_pill, &RMF_STRING); if (strlen(buf) == 0) sprintf(buf, "%s", "No log informations\n"); - memcpy(reply, buf, buf_len); + memcpy(reply, buf, LLOG_CHUNK_SIZE); out_free: - OBD_FREE(buf, buf_len); + OBD_FREE(buf, LLOG_CHUNK_SIZE); return rc; }