Whamcloud - gitweb
LU-13004 ptlrpc: Allow BULK_BUF_KIOV to accept a kvec
[fs/lustre-release.git] / lustre / ptlrpc / llog_server.c
index c72d2e1..ca91a1c 100644 (file)
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 
 #define DEBUG_SUBSYSTEM S_LOG
 
-#ifndef __KERNEL__
-#include <liblustre.h>
-#endif
-
 #include <obd_class.h>
+#include <lu_target.h>
 #include <lustre_log.h>
 #include <lustre_net.h>
-#include <libcfs/list.h>
-#include <lustre_fsfilt.h>
-
-#if defined(__KERNEL__) && defined(LUSTRE_LOG_SERVER)
 
-int llog_origin_handle_create(struct ptlrpc_request *req)
+static int llog_origin_close(const struct lu_env *env, struct llog_handle *lgh)
 {
-        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 = 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_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, "%s: opening log %s\n", obd->obd_name, name);
-        }
-
-        ctxt = llog_get_context(obd, body->lgd_ctxt_idx);
-        if (ctxt == NULL) {
-                CDEBUG(D_WARNING, "%s: no ctxt. group=%p idx=%d name=%s\n",
-                       obd->obd_name, &obd->obd_olg, body->lgd_ctxt_idx, name);
-                RETURN(-ENODEV);
-        }
-        disk_obd = ctxt->loc_exp->exp_obd;
-        push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
-
-        rc = llog_create(ctxt, &loghandle, logid, name);
-        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;
-
-        GOTO(out_close, rc);
-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;
+       if (lgh->lgh_hdr != NULL && lgh->lgh_hdr->llh_flags & LLOG_F_IS_CAT)
+               return llog_cat_close(env, lgh);
+       else
+               return llog_close(env, lgh);
 }
 
-int llog_origin_handle_destroy(struct ptlrpc_request *req)
+/* Only open is supported, no new llog can be created remotely */
+int llog_origin_handle_open(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                   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(-ENODEV);
-
-        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;
-        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);
-        GOTO(out_close, rc);
-out_close:
-        if (rc)
-                llog_close(loghandle);
-out_pop:
-        pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
-        llog_ctxt_put(ctxt);
-        return rc;
+       struct obd_export       *exp = req->rq_export;
+       struct obd_device       *obd = exp->exp_obd;
+       struct llog_handle      *loghandle;
+       struct llogd_body       *body;
+       struct llog_logid       *logid = NULL;
+       struct llog_ctxt        *ctxt;
+       char                    *name = NULL;
+       int                      rc;
+
+       ENTRY;
+
+       body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
+       if (body == NULL)
+               RETURN(err_serious(-EFAULT));
+
+       rc = req_capsule_server_pack(&req->rq_pill);
+       if (rc)
+               RETURN(err_serious(-ENOMEM));
+
+       if (ostid_id(&body->lgd_logid.lgl_oi) > 0)
+               logid = &body->lgd_logid;
+
+       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, "%s: opening log %s\n", obd->obd_name, name);
+       }
+
+       if (body->lgd_ctxt_idx >= LLOG_MAX_CTXTS) {
+               CDEBUG(D_WARNING, "%s: bad ctxt ID: idx=%d name=%s\n",
+                      obd->obd_name, body->lgd_ctxt_idx, name);
+               RETURN(-EPROTO);
+       }
+
+       ctxt = llog_get_context(obd, body->lgd_ctxt_idx);
+       if (ctxt == NULL) {
+               CDEBUG(D_WARNING, "%s: no ctxt. group=%p idx=%d name=%s\n",
+                      obd->obd_name, &obd->obd_olg, body->lgd_ctxt_idx, name);
+               RETURN(-ENODEV);
+       }
+
+       rc = llog_open(req->rq_svc_thread->t_env, ctxt, &loghandle, logid,
+                      name, LLOG_OPEN_EXISTS);
+       if (rc)
+               GOTO(out_ctxt, rc);
+
+       body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
+       body->lgd_logid = loghandle->lgh_id;
+
+       llog_origin_close(req->rq_svc_thread->t_env, loghandle);
+       EXIT;
+out_ctxt:
+       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 llog_handle  *loghandle;
-        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 = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
-        if (body == NULL)
-                RETURN(-EFAULT);
-
-        OBD_ALLOC(buf, LLOG_CHUNK_SIZE);
-        if (!buf)
-                RETURN(-ENOMEM);
-
-        ctxt = llog_get_context(obd, body->lgd_ctxt_idx);
-        if (ctxt == NULL)
-                GOTO(out_free, rc = -ENODEV);
-        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);
-
-        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_next_block(loghandle, &body->lgd_saved_index,
-                             body->lgd_index,
-                             &body->lgd_cur_offset, buf, LLOG_CHUNK_SIZE);
-        if (rc)
-                GOTO(out_close, rc);
-
-        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);
-
-        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);
-        GOTO(out_close, rc);
+       struct llog_handle      *loghandle;
+       struct llogd_body       *body;
+       struct llogd_body       *repbody;
+       struct llog_ctxt        *ctxt;
+       __u32                    flags;
+       void                    *ptr;
+       int                      rc;
+
+       ENTRY;
+
+       body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
+       if (body == NULL)
+               RETURN(err_serious(-EFAULT));
+
+       req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER,
+                            LLOG_MIN_CHUNK_SIZE);
+       rc = req_capsule_server_pack(&req->rq_pill);
+       if (rc)
+               RETURN(err_serious(-ENOMEM));
+
+       if (body->lgd_ctxt_idx >= LLOG_MAX_CTXTS) {
+               CDEBUG(D_WARNING, "%s: bad ctxt ID: idx=%d\n",
+                      req->rq_export->exp_obd->obd_name, body->lgd_ctxt_idx);
+               RETURN(-EPROTO);
+       }
+
+       ctxt = llog_get_context(req->rq_export->exp_obd, body->lgd_ctxt_idx);
+       if (ctxt == NULL)
+               RETURN(-ENODEV);
+
+       rc = llog_open(req->rq_svc_thread->t_env, ctxt, &loghandle,
+                      &body->lgd_logid, NULL, LLOG_OPEN_EXISTS);
+       if (rc)
+               GOTO(out_ctxt, rc);
+
+       flags = body->lgd_llh_flags;
+       rc = llog_init_handle(req->rq_svc_thread->t_env, loghandle, flags,
+                             NULL);
+       if (rc)
+               GOTO(out_close, rc);
+
+       repbody = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
+       *repbody = *body;
+
+       ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);
+       rc = llog_next_block(req->rq_svc_thread->t_env, loghandle,
+                            &repbody->lgd_saved_index, repbody->lgd_index,
+                            &repbody->lgd_cur_offset, ptr,
+                            LLOG_MIN_CHUNK_SIZE);
+       if (rc)
+               GOTO(out_close, rc);
+       EXIT;
 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);
-out_free:
-        OBD_FREE(buf, LLOG_CHUNK_SIZE);
-        return rc;
+       llog_origin_close(req->rq_svc_thread->t_env, loghandle);
+out_ctxt:
+       llog_ctxt_put(ctxt);
+       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 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 = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
-        if (body == NULL)
-                RETURN(-EFAULT);
-
-        OBD_ALLOC(buf, LLOG_CHUNK_SIZE);
-        if (!buf)
-                RETURN(-ENOMEM);
-
-        ctxt = llog_get_context(obd, body->lgd_ctxt_idx);
-        if (ctxt == NULL)
-                GOTO(out_free, rc = -ENODEV);
-
-        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);
-
-        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);
-
-        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);
-
-        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);
-        GOTO(out_close, rc);
+       struct llog_handle      *loghandle;
+       struct llogd_body       *body;
+       struct llogd_body       *repbody;
+       struct llog_ctxt        *ctxt;
+       __u32                    flags;
+       void                    *ptr;
+       int                      rc;
+
+       ENTRY;
+
+       body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
+       if (body == NULL)
+               RETURN(err_serious(-EFAULT));
+
+       req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER,
+                            LLOG_MIN_CHUNK_SIZE);
+       rc = req_capsule_server_pack(&req->rq_pill);
+       if (rc)
+               RETURN(err_serious(-ENOMEM));
+
+       if (body->lgd_ctxt_idx >= LLOG_MAX_CTXTS) {
+               CDEBUG(D_WARNING, "%s: bad ctxt ID: idx=%d\n",
+                      req->rq_export->exp_obd->obd_name, body->lgd_ctxt_idx);
+               RETURN(-EPROTO);
+       }
+
+       ctxt = llog_get_context(req->rq_export->exp_obd, body->lgd_ctxt_idx);
+       if (ctxt == NULL)
+               RETURN(-ENODEV);
+
+       rc = llog_open(req->rq_svc_thread->t_env, ctxt, &loghandle,
+                        &body->lgd_logid, NULL, LLOG_OPEN_EXISTS);
+       if (rc)
+               GOTO(out_ctxt, rc);
+
+       flags = body->lgd_llh_flags;
+       rc = llog_init_handle(req->rq_svc_thread->t_env, loghandle, flags,
+                             NULL);
+       if (rc)
+               GOTO(out_close, rc);
+
+       repbody = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
+       *repbody = *body;
+
+       ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);
+       rc = llog_prev_block(req->rq_svc_thread->t_env, loghandle,
+                            body->lgd_index, ptr, LLOG_MIN_CHUNK_SIZE);
+       if (rc)
+               GOTO(out_close, rc);
+
+       EXIT;
 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);
-out_free:
-        OBD_FREE(buf, LLOG_CHUNK_SIZE);
-        return rc;
+       llog_origin_close(req->rq_svc_thread->t_env, loghandle);
+out_ctxt:
+       llog_ctxt_put(ctxt);
+       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(-ENODEV);
-
-        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);
-
-        /*
-         * llog_init_handle() reads the llog 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);
-
-        hdr = req_capsule_server_get(&req->rq_pill, &RMF_LLOG_LOG_HDR);
-        *hdr = *loghandle->lgh_hdr;
-        GOTO(out_close, rc);
+       struct llog_handle      *loghandle;
+       struct llogd_body       *body;
+       struct llog_log_hdr     *hdr;
+       struct llog_ctxt        *ctxt;
+       __u32                    flags;
+       int                      rc;
+
+       ENTRY;
+
+       body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
+       if (body == NULL)
+               RETURN(err_serious(-EFAULT));
+
+       rc = req_capsule_server_pack(&req->rq_pill);
+       if (rc)
+               RETURN(err_serious(-ENOMEM));
+
+       if (body->lgd_ctxt_idx >= LLOG_MAX_CTXTS) {
+               CDEBUG(D_WARNING, "%s: bad ctxt ID: idx=%d\n",
+                      req->rq_export->exp_obd->obd_name, body->lgd_ctxt_idx);
+               RETURN(-EPROTO);
+       }
+
+       ctxt = llog_get_context(req->rq_export->exp_obd, body->lgd_ctxt_idx);
+       if (ctxt == NULL)
+               RETURN(-ENODEV);
+
+       rc = llog_open(req->rq_svc_thread->t_env, ctxt, &loghandle,
+                      &body->lgd_logid, NULL, LLOG_OPEN_EXISTS);
+       if (rc)
+               GOTO(out_ctxt, rc);
+
+       /*
+        * llog_init_handle() reads the llog header
+        */
+       flags = body->lgd_llh_flags;
+       rc = llog_init_handle(req->rq_svc_thread->t_env, loghandle, flags,
+                             NULL);
+       if (rc)
+               GOTO(out_close, rc);
+       flags = loghandle->lgh_hdr->llh_flags;
+
+       hdr = req_capsule_server_get(&req->rq_pill, &RMF_LLOG_LOG_HDR);
+       *hdr = *loghandle->lgh_hdr;
+       EXIT;
 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;
-}
-
-int llog_origin_handle_close(struct ptlrpc_request *req)
-{
-        ENTRY;
-        /* Nothing to do */
-        RETURN(0);
-}
-
-int llog_origin_handle_cancel(struct ptlrpc_request *req)
-{
-        struct obd_device *obd = req->rq_export->exp_obd;
-        int num_cookies, rc = 0, err, i, failed = 0;
-        struct obd_device *disk_obd;
-        struct llog_cookie *logcookies;
-        struct llog_ctxt *ctxt = NULL;
-        struct lvfs_run_ctxt saved;
-        struct llog_handle *cathandle;
-        struct inode *inode;
-        void *handle;
-        ENTRY;
-
-        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 llog cookies sent");
-                RETURN(-EFAULT);
-        }
-
-        ctxt = llog_get_context(obd, logcookies->lgc_subsys);
-        if (ctxt == NULL)
-                RETURN(-ENODEV);
-
-        disk_obd = ctxt->loc_exp->exp_obd;
-        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_log() failed: %ld\n",
-                               PTR_ERR(handle));
-                        GOTO(pop_ctxt, rc = PTR_ERR(handle));
-                }
-
-                rc = llog_cat_cancel_records(cathandle, 1, logcookies);
-
-                /*
-                 * Do not raise -ENOENT errors for resent rpcs. This rec already
-                 * might be killed.
-                 */
-                if (rc == -ENOENT &&
-                    (lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT)) {
-                        /*
-                         * Do not change this message, reply-single.sh test_59b
-                         * expects to find this in log.
-                         */
-                        CDEBUG(D_RPCTRACE, "RESENT cancel req %p - ignored\n",
-                               req);
-                        rc = 0;
-                } else if (rc == 0) {
-                        CDEBUG(D_RPCTRACE, "Canceled %d llog-records\n",
-                               num_cookies);
-                }
-
-                err = fsfilt_commit(disk_obd, inode, handle, 0);
-                if (err) {
-                        CERROR("Error committing transaction: %d\n", err);
-                        if (!rc)
-                                rc = err;
-                        failed++;
-                        GOTO(pop_ctxt, rc);
-                } else if (rc)
-                        failed++;
-        }
-        GOTO(pop_ctxt, rc);
-pop_ctxt:
-        pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
-        if (rc)
-                CERROR("Cancel %d of %d llog-records failed: %d\n",
-                       failed, num_cookies, rc);
-
-        llog_ctxt_put(ctxt);
-        return rc;
-}
-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;
-        ENTRY;
-
-        if (ctxt == NULL || mds == NULL)
-                GOTO(release_ctxt, rc = -ENODEV);
-
-        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]);
-                if (rc)
-                        GOTO(out_pop, rc);
-                rc = llog_init_handle(handle, 0, NULL);
-                if (rc) {
-                        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],
-                             i_size_read(handle->lgh_file->f_dentry->d_inode),
-                             handle->lgh_last_idx, uncanceled);
-                out += l;
-                remains -= l;
-
-                llog_close(handle);
-                if (remains <= 0)
-                        break;
-        }
-        GOTO(out_pop, rc);
-out_pop:
-        pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL);
-release_ctxt:
-        llog_ctxt_put(ctxt);
-        return rc;
-}
-
-struct cb_data {
-        struct llog_ctxt *ctxt;
-        char *out;
-        int  remains;
-        int  init;
-};
-
-static int llog_catinfo_cb(struct llog_handle *cat,
-                           struct llog_rec_hdr *rec, void *data)
-{
-        static char *out = NULL;
-        static int remains = 0;
-        struct llog_ctxt *ctxt = NULL;
-        struct llog_handle *handle = NULL;
-        struct llog_logid *logid;
-        struct llog_logid_rec *lir;
-        int l, rc, index, count = 0;
-        struct cb_data *cbd = (struct cb_data*)data;
-        ENTRY;
-
-        if (cbd->init) {
-                out = cbd->out;
-                remains = cbd->remains;
-                cbd->init = 0;
-        }
-
-        if (!(cat->lgh_hdr->llh_flags & LLOG_F_IS_CAT))
-                RETURN(-EINVAL);
-
-        if (!cbd->ctxt)
-                RETURN(-ENODEV);
-
-        lir = (struct llog_logid_rec *)rec;
-        logid = &lir->lid_id;
-        rc = llog_create(ctxt, &handle, logid, NULL);
-        if (rc)
-                RETURN(-EINVAL);
-        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++;
-        }
-
-        l = snprintf(out, remains, "\t[Log ID]: #"LPX64"#"LPX64"#%08x\n"
-                     "\tLog Size: %llu\n\tLast Index: %d\n"
-                     "\tUncanceled Records: %d\n",
-                     logid->lgl_oid, logid->lgl_oseq, logid->lgl_ogen,
-                     i_size_read(handle->lgh_file->f_dentry->d_inode),
-                     handle->lgh_last_idx, count);
-        out += l;
-        remains -= l;
-        cbd->out = out;
-        cbd->remains = remains;
-        if (remains <= 0) {
-                CWARN("Not enough memory\n");
-                rc = -ENOMEM;
-        }
-        EXIT;
-out_close:
-        llog_close(handle);
-        return rc;
-}
-
-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 lvfs_run_ctxt saved;
-        int size, i, count;
-        struct llog_catid *idarray;
-        char name[32] = CATLIST;
-        struct cb_data data;
-        struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT);
-        int rc;
-        ENTRY;
-
-        if (ctxt == NULL || mds == NULL)
-                GOTO(release_ctxt, rc = -ENODEV);
-
-        count = mds->mds_lov_desc.ld_tgt_count;
-        size = sizeof(*idarray) * count;
-
-        OBD_ALLOC_LARGE(idarray, size);
-        if (!idarray)
-                GOTO(release_ctxt, rc = -ENOMEM);
-
-        cfs_mutex_lock(&obd->obd_olg.olg_cat_processing);
-        rc = llog_get_cat_list(obd, name, 0, count, idarray);
-        if (rc)
-                GOTO(out_free, rc);
-
-        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;
-
-                rc = llog_create(ctxt, &handle, &idarray[i].lci_logid, NULL);
-                if (rc)
-                        GOTO(out_pop, rc);
-                rc = llog_init_handle(handle, 0, NULL);
-                if (rc) {
-                        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(data.out, data.remains,
-                             "\n[Catlog ID]: #"LPX64"#"LPX64"#%08x  "
-                             "[Log Count]: %d\n",
-                             idarray[i].lci_logid.lgl_oid,
-                             idarray[i].lci_logid.lgl_oseq,
-                             idarray[i].lci_logid.lgl_ogen, uncanceled);
-
-                data.out += l;
-                data.remains -= l;
-                data.init = 1;
-
-                llog_process(handle, llog_catinfo_cb, &data, NULL);
-                llog_close(handle);
-
-                if (data.remains <= 0)
-                        break;
-        }
-        EXIT;
-out_pop:
-        pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL);
-out_free:
-        cfs_mutex_unlock(&obd->obd_olg.olg_cat_processing);
-        OBD_FREE_LARGE(idarray, size);
-release_ctxt:
-        llog_ctxt_put(ctxt);
-        return rc;
-}
-
-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;
-        ENTRY;
-
-        OBD_ALLOC(buf, LLOG_CHUNK_SIZE);
-        if (buf == NULL)
-                RETURN(-ENOMEM);
-
-        memset(buf, 0, LLOG_CHUNK_SIZE);
-
-        keyword = req_capsule_client_get(&req->rq_pill, &RMF_NAME);
-        LASSERT(keyword);
-
-        if (strcmp(keyword, "config") == 0) {
-                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, LLOG_CHUNK_SIZE);
-        } else {
-                rc = -EOPNOTSUPP;
-        }
-
-        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 = req_capsule_server_get(&req->rq_pill, &RMF_STRING);
-        if (strlen(buf) == 0)
-                sprintf(buf, "%s", "No log informations\n");
-        memcpy(reply, buf, LLOG_CHUNK_SIZE);
-        EXIT;
-out_free:
-        OBD_FREE(buf, LLOG_CHUNK_SIZE);
-        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;
+       llog_origin_close(req->rq_svc_thread->t_env, loghandle);
+out_ctxt:
+       llog_ctxt_put(ctxt);
+       return rc;
 }
-#endif