Whamcloud - gitweb
init rq_history_list before use.
[fs/lustre-release.git] / lustre / ptlrpc / llog_server.c
index a15f67c..d0b618b 100644 (file)
@@ -4,20 +4,23 @@
  *  Copyright (C) 2001-2003 Cluster File Systems, Inc.
  *   Author: Andreas Dilger <adilger@clusterfs.com>
  *
- *   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
  *
 
 #ifndef __KERNEL__
 #include <liblustre.h>
-#else
-#include <linux/fs.h>
 #endif
 
-#include <linux/obd_class.h>
-#include <linux/lustre_log.h>
-#include <linux/lustre_net.h>
-#include <portals/list.h>
-#include <linux/lustre_fsfilt.h>
+#include <obd_class.h>
+#include <lustre_log.h>
+#include <lustre_net.h>
+#include <libcfs/list.h>
+#include <lustre_fsfilt.h>
 
-#ifdef __KERNEL__
+#if defined(__KERNEL__) && defined(LUSTRE_LOG_SERVER)
 
 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 obd_run_ctxt saved;
-        struct llog_logid *logid = NULL;
-        struct llog_ctxt *ctxt;
-        char * name = NULL;
-        int size = 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, 0, 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 (req->rq_reqmsg->bufcount > 1) {
-                name = lustre_msg_string(req->rq_reqmsg, 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);
-        LASSERT(ctxt != NULL);
+        if (ctxt == NULL)
+                RETURN(-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 = req_capsule_server_pack(&req->rq_pill);
         if (rc)
                 GOTO(out_close, rc = -ENOMEM);
 
-        body = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*body));
+        body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
         body->lgd_logid = loghandle->lgh_id;
 
 out_close:
@@ -97,43 +94,96 @@ out_close:
         if (!rc)
                 rc = rc2;
 out_pop:
-        pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
-out:
+        pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
+        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;
+        __u32                 flags;
+        int                   rc;
+        ENTRY;
+
+        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)
+                RETURN(-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 = req_capsule_server_pack(&req->rq_pill);
+        if (rc)
+                GOTO(out_close, rc = -ENOMEM);
+
+        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);
+        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);
+        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 obd_run_ctxt saved;
-        struct llog_ctxt *ctxt;
-        __u32 flags;
-        __u8 *buf;
-        void * ptr;
-        int size[] = {sizeof (*body),
-                      LLOG_CHUNK_SIZE};
-        int rc, rc2;
+        struct llogd_body   *body;
+        struct llogd_body   *repbody;
+        struct lvfs_run_ctxt saved;
+        struct llog_ctxt    *ctxt;
+        __u32                flags;
+        __u8                *buf;
+        void                *ptr;
+        int                  rc, rc2;
         ENTRY;
 
-        body = lustre_swab_reqbuf(req, 0, 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);
+        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)
@@ -151,15 +201,16 @@ int llog_origin_handle_next_block(struct ptlrpc_request *req)
         if (rc)
                 GOTO(out_close, rc);
 
-
-        rc = lustre_pack_reply(req, 2, 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, 0, 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, 1, LLOG_CHUNK_SIZE);
+        ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);
         memcpy(ptr, buf, LLOG_CHUNK_SIZE);
 
 out_close:
@@ -168,61 +219,68 @@ out_close:
                 rc = rc2;
 
 out_pop:
-        pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
+        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_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 llog_ctxt *ctxt;
-        __u32 flags;
-        __u8 *buf;
-        int size[] = {sizeof (*hdr)};
-        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, 0, 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);
         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);
+        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);
 
-        hdr = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*hdr));
-        memcpy(hdr, loghandle->lgh_hdr, sizeof(*hdr));
+        repbody = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
+        *repbody = *body;
+
+        ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);
+        memcpy(ptr, buf, LLOG_CHUNK_SIZE);
 
 out_close:
         rc2 = llog_close(loghandle);
@@ -230,10 +288,60 @@ out_close:
                 rc = rc2;
 
 out_pop:
-        pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
+        pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
+        llog_ctxt_put(ctxt);
         OBD_FREE(buf, LLOG_CHUNK_SIZE);
+        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                   rc, rc2;
+        ENTRY;
+
+        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)
+                RETURN(-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 = req_capsule_server_pack(&req->rq_pill);
+        if (rc)
+                GOTO(out_close, rc = -ENOMEM);
 
-out:
+        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);
+        llog_ctxt_put(ctxt);
         RETURN(rc);
 }
 
@@ -251,16 +359,17 @@ 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 obd_run_ctxt saved;
+        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 = 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);
@@ -273,14 +382,14 @@ int llog_origin_handle_cancel(struct ptlrpc_request *req)
         }
 
         disk_obd = ctxt->loc_exp->exp_obd;
-        push_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
+        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(disk_obd, inode,
-                                      FSFILT_OP_CANCEL_UNLINK_LOG, NULL);
+                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));
@@ -297,12 +406,13 @@ int llog_origin_handle_cancel(struct ptlrpc_request *req)
                 }
         }
 pop_ctxt:
-        pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
+        pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
         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);
@@ -310,18 +420,18 @@ 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 obd_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_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);
@@ -347,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;
@@ -357,7 +467,9 @@ 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);
+release_ctxt:
+        llog_ctxt_put(ctxt);
         RETURN(rc);
 }
 
@@ -373,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;
@@ -385,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 & cpu_to_le32(LLOG_F_IS_CAT)))
+        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);
@@ -408,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;
@@ -429,37 +543,38 @@ static int llog_catinfo_deletions(struct obd_device *obd, char *buf,
 {
         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";
-        int rc;
+        struct llog_catid *idarray;
+        struct llog_logid *id;
+        char name[32] = CATLIST;
         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);
-        memset(idarray, 0, size);
+                GOTO(release_ctxt, rc = -ENOMEM);
 
         rc = llog_get_cat_list(obd, obd, name, count, idarray);
         if (rc)
                 GOTO(out_free, rc);
 
-        push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL);
+        push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL);
 
-        id = idarray;
         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);
@@ -489,9 +604,12 @@ static int llog_catinfo_deletions(struct obd_device *obd, char *buf,
                         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);
+release_ctxt:
+        llog_ctxt_put(ctxt);
+
         RETURN(rc);
 }
 
@@ -499,37 +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;
+        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, 0, 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, 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, 1, &buf_len, 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, 0, 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;
 }
 
@@ -539,11 +663,23 @@ 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();