X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fllog_server.c;h=b06c2f6d6002871c43cc6be2661f287baf0f43ad;hb=eef822668e9c4794fc5f06747e03985518fa1d19;hp=b0b739ea305a74d8b297bc6fc1d33d960bab8991;hpb=250866233e4ae873f047277f990ce647cb5de246;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/llog_server.c b/lustre/ptlrpc/llog_server.c index b0b739e..b06c2f6 100644 --- a/lustre/ptlrpc/llog_server.c +++ b/lustre/ptlrpc/llog_server.c @@ -4,20 +4,23 @@ * Copyright (C) 2001-2003 Cluster File Systems, Inc. * Author: Andreas Dilger * - * This file is part of Lustre, http://www.lustre.org. + * This file is part of the Lustre file system, http://www.lustre.org + * Lustre is a trademark of Cluster File Systems, Inc. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions + * of that agreement, and the following does not apply to you. See the + * LICENSE file included with this distribution for more information. * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * If you did not agree to a different license, then this copy of Lustre + * is open source software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * In either case, Lustre is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license text for more details. * * remote api for llog - server side * @@ -29,11 +32,17 @@ #define EXPORT_SYMTAB #endif -#include -#include -#include -#include -#include +#ifndef __KERNEL__ +#include +#endif + +#include +#include +#include +#include +#include + +#if defined(__KERNEL__) && defined(LUSTRE_LOG_SERVER) int llog_origin_handle_create(struct ptlrpc_request *req) { @@ -42,15 +51,15 @@ int llog_origin_handle_create(struct ptlrpc_request *req) struct obd_device *disk_obd; struct llog_handle *loghandle; struct llogd_body *body; - struct obd_run_ctxt saved; + struct lvfs_run_ctxt saved; struct llog_logid *logid = NULL; struct llog_ctxt *ctxt; char * name = NULL; - int size = sizeof (*body); + int size[2] = { sizeof(struct ptlrpc_body), sizeof(*body) }; int rc, rc2; ENTRY; - body = lustre_swab_reqbuf(req, 0, sizeof(*body), + body = lustre_swab_reqbuf(req, REQ_REC_OFF, sizeof(*body), lustre_swab_llogd_body); if (body == NULL) { CERROR ("Can't unpack llogd_body\n"); @@ -60,28 +69,30 @@ int llog_origin_handle_create(struct ptlrpc_request *req) if (body->lgd_logid.lgl_oid > 0) logid = &body->lgd_logid; - if (req->rq_reqmsg->bufcount > 1) { - name = lustre_msg_string(req->rq_reqmsg, 1, 0); + 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); } + CDEBUG(D_INFO, "opening log %s\n", name); } ctxt = llog_get_context(obd, body->lgd_ctxt_idx); - LASSERT(ctxt != NULL); + if (ctxt == NULL) + GOTO(out, rc = -EINVAL); disk_obd = ctxt->loc_exp->exp_obd; - push_ctxt(&saved, &disk_obd->obd_ctxt, NULL); + push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); rc = llog_create(ctxt, &loghandle, logid, name); if (rc) GOTO(out_pop, rc); - rc = lustre_pack_reply(req, 1, &size, NULL); + rc = lustre_pack_reply(req, 2, size, NULL); if (rc) GOTO(out_close, rc = -ENOMEM); - body = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*body)); + body = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof(*body)); body->lgd_logid = loghandle->lgh_id; out_close: @@ -89,7 +100,66 @@ out_close: if (!rc) rc = rc2; out_pop: - pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL); + pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); +out: + 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; + 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); + } + + 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); + disk_obd = ctxt->loc_exp->exp_obd; + push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); + + rc = llog_create(ctxt, &loghandle, logid, NULL); + if (rc) + GOTO(out_pop, rc); + + rc = lustre_pack_reply(req, 2, size, NULL); + if (rc) + GOTO(out_close, rc = -ENOMEM); + + body = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof (*body)); + body->lgd_logid = loghandle->lgh_id; + flags = body->lgd_llh_flags; + rc = llog_init_handle(loghandle, LLOG_F_IS_PLAIN, NULL); + if (rc) + GOTO(out_close, rc); + rc = llog_destroy(loghandle); + if (rc) + GOTO(out_close, rc); + llog_free_handle(loghandle); + +out_close: + if (rc) + llog_close(loghandle); +out_pop: + pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); out: RETURN(rc); } @@ -101,17 +171,18 @@ int llog_origin_handle_next_block(struct ptlrpc_request *req) struct obd_device *disk_obd; struct llog_handle *loghandle; struct llogd_body *body; - struct obd_run_ctxt saved; + struct lvfs_run_ctxt saved; struct llog_ctxt *ctxt; __u32 flags; __u8 *buf; void * ptr; - int size[] = {sizeof (*body), - LLOG_CHUNK_SIZE}; + int size[3] = { sizeof(struct ptlrpc_body), + sizeof(*body), + LLOG_CHUNK_SIZE }; int rc, rc2; ENTRY; - body = lustre_swab_reqbuf(req, 0, sizeof(*body), + body = lustre_swab_reqbuf(req, REQ_REC_OFF, sizeof(*body), lustre_swab_llogd_body); if (body == NULL) { CERROR ("Can't unpack llogd_body\n"); @@ -123,9 +194,10 @@ int llog_origin_handle_next_block(struct ptlrpc_request *req) GOTO(out, rc = -ENOMEM); ctxt = llog_get_context(obd, body->lgd_ctxt_idx); - LASSERT(ctxt != NULL); + if (ctxt == NULL) + GOTO(out_free, rc = -EINVAL); disk_obd = ctxt->loc_exp->exp_obd; - push_ctxt(&saved, &disk_obd->obd_ctxt, NULL); + push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); rc = llog_create(ctxt, &loghandle, &body->lgd_logid, NULL); if (rc) @@ -144,14 +216,14 @@ int llog_origin_handle_next_block(struct ptlrpc_request *req) GOTO(out_close, rc); - rc = lustre_pack_reply(req, 2, size, NULL); + rc = lustre_pack_reply(req, 3, size, NULL); if (rc) GOTO(out_close, rc = -ENOMEM); - ptr = lustre_msg_buf(req->rq_repmsg, 0, sizeof (body)); + ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof (body)); memcpy(ptr, body, sizeof(*body)); - ptr = lustre_msg_buf(req->rq_repmsg, 1, LLOG_CHUNK_SIZE); + ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF + 1, LLOG_CHUNK_SIZE); memcpy(ptr, buf, LLOG_CHUNK_SIZE); out_close: @@ -160,29 +232,32 @@ out_close: rc = rc2; out_pop: - pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL); + pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); +out_free: OBD_FREE(buf, LLOG_CHUNK_SIZE); out: RETURN(rc); } -int llog_origin_handle_read_header(struct ptlrpc_request *req) +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 obd_device *disk_obd; struct llog_handle *loghandle; struct llogd_body *body; - struct llog_log_hdr *hdr; - struct obd_run_ctxt saved; + struct obd_device *disk_obd; + struct lvfs_run_ctxt saved; struct llog_ctxt *ctxt; __u32 flags; __u8 *buf; - int size[] = {sizeof (*hdr)}; + void * ptr; + int size[] = { sizeof(struct ptlrpc_body), + sizeof(*body), + LLOG_CHUNK_SIZE }; int rc, rc2; ENTRY; - body = lustre_swab_reqbuf(req, 0, sizeof(*body), + body = lustre_swab_reqbuf(req, REQ_REC_OFF, sizeof(*body), lustre_swab_llogd_body); if (body == NULL) { CERROR ("Can't unpack llogd_body\n"); @@ -196,25 +271,33 @@ int llog_origin_handle_read_header(struct ptlrpc_request *req) ctxt = llog_get_context(obd, body->lgd_ctxt_idx); LASSERT(ctxt != NULL); disk_obd = ctxt->loc_exp->exp_obd; - push_ctxt(&saved, &disk_obd->obd_ctxt, NULL); + push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); rc = llog_create(ctxt, &loghandle, &body->lgd_logid, NULL); if (rc) GOTO(out_pop, rc); - /* init_handle reads the header */ flags = body->lgd_llh_flags; rc = llog_init_handle(loghandle, flags, NULL); if (rc) GOTO(out_close, rc); + memset(buf, 0, LLOG_CHUNK_SIZE); + rc = llog_prev_block(loghandle, body->lgd_index, + buf, LLOG_CHUNK_SIZE); + if (rc) + GOTO(out_close, rc); + - rc = lustre_pack_reply(req, 1, size, NULL); + rc = lustre_pack_reply(req, 3, size, NULL); if (rc) GOTO(out_close, rc = -ENOMEM); - hdr = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*hdr)); - memcpy(hdr, loghandle->lgh_hdr, sizeof(*hdr)); + ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof(body)); + memcpy(ptr, body, sizeof(*body)); + + ptr = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF+1, LLOG_CHUNK_SIZE); + memcpy(ptr, buf, LLOG_CHUNK_SIZE); out_close: rc2 = llog_close(loghandle); @@ -222,8 +305,64 @@ out_close: rc = rc2; out_pop: - pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL); + pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); 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; + 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); + } + + ctxt = llog_get_context(obd, body->lgd_ctxt_idx); + if (ctxt == NULL) + GOTO(out, rc = -EINVAL); + disk_obd = ctxt->loc_exp->exp_obd; + push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); + + rc = llog_create(ctxt, &loghandle, &body->lgd_logid, NULL); + if (rc) + GOTO(out_pop, rc); + + /* init_handle reads the header */ + flags = body->lgd_llh_flags; + rc = llog_init_handle(loghandle, flags, NULL); + if (rc) + GOTO(out_close, rc); + + rc = lustre_pack_reply(req, 2, size, NULL); + 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)); + +out_close: + rc2 = llog_close(loghandle); + if (!rc) + rc = rc2; + +out_pop: + pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); out: RETURN(rc); @@ -238,20 +377,23 @@ int llog_origin_handle_close(struct ptlrpc_request *req) RETURN(rc); } -#ifdef ENABLE_ORPHANS 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; - int num_cookies, rc = 0; - struct obd_run_ctxt saved; + int num_cookies, rc = 0, err, i; + struct lvfs_run_ctxt saved; struct llog_handle *cathandle; + struct inode *inode; + void *handle; ENTRY; - logcookies = lustre_msg_buf(req->rq_reqmsg, 0, sizeof(*logcookies)); - num_cookies = req->rq_reqmsg->buflens[0]/sizeof(*logcookies); + 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); if (logcookies == NULL || num_cookies == 0) { DEBUG_REQ(D_HA, req, "no cookies sent"); RETURN(-EFAULT); @@ -262,47 +404,63 @@ int llog_origin_handle_cancel(struct ptlrpc_request *req) CWARN("llog subsys not setup or already cleanup\n"); RETURN(-ENOENT); } - down(&ctxt->loc_sem); + disk_obd = ctxt->loc_exp->exp_obd; - cathandle = ctxt->loc_handle; - LASSERT(cathandle); + push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); + for (i = 0; i < num_cookies; i++, logcookies++) { + cathandle = ctxt->loc_handle; + LASSERT(cathandle != NULL); + inode = cathandle->lgh_file->f_dentry->d_inode; + + handle = fsfilt_start_log(disk_obd, inode, + FSFILT_OP_CANCEL_UNLINK, NULL, 1); + if (IS_ERR(handle)) { + CERROR("fsfilt_start failed: %ld\n", PTR_ERR(handle)); + GOTO(pop_ctxt, rc = PTR_ERR(handle)); + } + + rc = llog_cat_cancel_records(cathandle, 1, logcookies); - push_ctxt(&saved, &disk_obd->obd_ctxt, NULL); - rc = llog_cat_cancel_records(cathandle, num_cookies, logcookies); + err = fsfilt_commit(disk_obd, inode, handle, 0); + if (err) { + CERROR("error committing transaction: %d\n", err); + if (!rc) + rc = err; + GOTO(pop_ctxt, rc); + } + } +pop_ctxt: + pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); if (rc) CERROR("cancel %d llog-records failed: %d\n", num_cookies, rc); else - CWARN("cancel %d llog-records\n", num_cookies); - - pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL); - up(&ctxt->loc_sem); + CDEBUG(D_HA, "cancel %d llog-records\n", num_cookies); RETURN(rc); } EXPORT_SYMBOL(llog_origin_handle_cancel); -#endif -static int llog_catinfo_config(struct obd_device *obd, char *buf, int buf_len, +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 obd_run_ctxt saved; + 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); - push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL); - + push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL); + sprintf(name[0], "%s", mds->mds_profile); sprintf(name[1], "%s-clean", mds->mds_profile); sprintf(name[2], "%s", client); sprintf(name[3], "%s-clean", client); - + for (i = 0; i < 4; i++) { int index, uncanceled = 0; rc = llog_create(ctxt, &handle, NULL, name[i]); @@ -313,18 +471,17 @@ static int llog_catinfo_config(struct obd_device *obd, char *buf, int buf_len, llog_close(handle); GOTO(out_pop, rc = -ENOENT); } - + for (index = 1; index < (LLOG_BITMAP_BYTES * 8); index ++) { if (ext2_test_bit(index, handle->lgh_hdr->llh_bitmap)) uncanceled++; } - + 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, - handle->lgh_last_idx, - uncanceled); + name[i], + i_size_read(handle->lgh_file->f_dentry->d_inode), + handle->lgh_last_idx, uncanceled); out += l; remains -= l; @@ -333,7 +490,7 @@ static int llog_catinfo_config(struct obd_device *obd, char *buf, int buf_len, break; } out_pop: - pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL); + pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL); RETURN(rc); } @@ -344,7 +501,7 @@ struct cb_data { int init; }; -static int llog_catinfo_cb(struct llog_handle *cat, +static int llog_catinfo_cb(struct llog_handle *cat, struct llog_rec_hdr *rec, void *data) { static char *out = NULL; @@ -363,9 +520,9 @@ static int llog_catinfo_cb(struct llog_handle *cat, } ctxt = cbd->ctxt; - if (!(cat->lgh_hdr->llh_flags & cpu_to_le32(LLOG_F_IS_CAT))) + if (!(cat->lgh_hdr->llh_flags & LLOG_F_IS_CAT)) RETURN(-EINVAL); - + lir = (struct llog_logid_rec *)rec; logid = &lir->lid_id; rc = llog_create(ctxt, &handle, logid, NULL); @@ -374,7 +531,7 @@ static int llog_catinfo_cb(struct llog_handle *cat, rc = llog_init_handle(handle, 0, NULL); if (rc) GOTO(out_close, rc); - + for (index = 1; index < (LLOG_BITMAP_BYTES * 8); index++) { if (ext2_test_bit(index, handle->lgh_hdr->llh_bitmap)) count++; @@ -384,7 +541,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; @@ -394,48 +551,49 @@ static int llog_catinfo_cb(struct llog_handle *cat, CWARN("Not enough memory\n"); rc = -ENOMEM; } - + out_close: llog_close(handle); RETURN(rc); } - -static int llog_catinfo_deletions(struct obd_device *obd, char *buf, + +static int llog_catinfo_deletions(struct obd_device *obd, char *buf, int buf_len) { struct mds_obd *mds = &obd->u.mds; struct llog_handle *handle; - struct obd_run_ctxt saved; + struct lvfs_run_ctxt saved; int size, i, count; - struct llog_logid *idarray, *id; - char name[32] = "CATLIST"; + 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); - + if (ctxt == NULL || mds == NULL) RETURN(-EOPNOTSUPP); - + count = mds->mds_lov_desc.ld_tgt_count; size = sizeof(*idarray) * count; - + OBD_ALLOC(idarray, size); if (!idarray) RETURN(-ENOMEM); - memset(idarray, 0, size); - + rc = llog_get_cat_list(obd, obd, name, count, idarray); - if (rc) + if (rc) GOTO(out_free, rc); - push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL); - - id = idarray; + push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL); + data.ctxt = ctxt; data.out = buf; data.remains = buf_len; for (i = 0; i < count; i++) { int l, index, uncanceled = 0; + + id = &idarray[i].lci_logid; rc = llog_create(ctxt, &handle, id, NULL); if (rc) GOTO(out_pop, rc); @@ -448,29 +606,29 @@ static int llog_catinfo_deletions(struct obd_device *obd, char *buf, if (ext2_test_bit(index, handle->lgh_hdr->llh_bitmap)) uncanceled++; } - l = snprintf(data.out, data.remains, + l = snprintf(data.out, data.remains, "\n[Catlog ID]: #"LPX64"#"LPX64"#%08x " "[Log Count]: %d\n", id->lgl_oid, id->lgl_ogr, id->lgl_ogen, uncanceled); - + data.out += l; data.remains -= l; data.init = 1; - - llog_process(handle, llog_catinfo_cb, &data); + + llog_process(handle, llog_catinfo_cb, &data, NULL); llog_close(handle); - + if (data.remains <= 0) break; } out_pop: - pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL); + pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL); out_free: OBD_FREE(idarray, size); RETURN(rc); } - + int llog_catinfo(struct ptlrpc_request *req) { struct obd_export *exp = req->rq_export; @@ -478,16 +636,18 @@ int llog_catinfo(struct ptlrpc_request *req) char *keyword; char *buf, *reply; int rc, buf_len = LLOG_CHUNK_SIZE; + int size[2] = { sizeof(struct ptlrpc_body), buf_len }; OBD_ALLOC(buf, buf_len); if (buf == NULL) return -ENOMEM; memset(buf, 0, buf_len); - keyword = lustre_msg_string(req->rq_reqmsg, 0, 0); + keyword = lustre_msg_string(req->rq_reqmsg, REQ_REC_OFF, 0); if (strcmp(keyword, "config") == 0) { - char *client = lustre_msg_string(req->rq_reqmsg, 1, 0); + char *client = lustre_msg_string(req->rq_reqmsg, + REQ_REC_OFF + 1, 0); rc = llog_catinfo_config(obd, buf, buf_len, client); } else if (strcmp(keyword, "deletions") == 0) { rc = llog_catinfo_deletions(obd, buf, buf_len); @@ -495,16 +655,56 @@ int llog_catinfo(struct ptlrpc_request *req) rc = -EOPNOTSUPP; } - rc = lustre_pack_reply(req, 1, &buf_len, NULL); + rc = lustre_pack_reply(req, 2, size, NULL); if (rc) GOTO(out_free, rc = -ENOMEM); - reply = lustre_msg_buf(req->rq_repmsg, 0, buf_len); + reply = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, buf_len); if (strlen(buf) == 0) sprintf(buf, "%s", "No log informations\n"); memcpy(reply, buf, buf_len); - + out_free: OBD_FREE(buf, buf_len); return rc; } + +#else /* !__KERNEL__ */ +int llog_origin_handle_create(struct ptlrpc_request *req) +{ + LBUG(); + return 0; +} + +int llog_origin_handle_destroy(struct ptlrpc_request *req) +{ + LBUG(); + return 0; +} + +int llog_origin_handle_next_block(struct ptlrpc_request *req) +{ + LBUG(); + return 0; +} +int llog_origin_handle_prev_block(struct ptlrpc_request *req) +{ + LBUG(); + return 0; +} +int llog_origin_handle_read_header(struct ptlrpc_request *req) +{ + LBUG(); + return 0; +} +int llog_origin_handle_close(struct ptlrpc_request *req) +{ + LBUG(); + return 0; +} +int llog_origin_handle_cancel(struct ptlrpc_request *req) +{ + LBUG(); + return 0; +} +#endif