Whamcloud - gitweb
LU-1302 llog: introduce llog_open
[fs/lustre-release.git] / lustre / ptlrpc / llog_server.c
index 86f4824..a4ea3f1 100644 (file)
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *  Copyright (C) 2001-2003 Cluster File Systems, Inc.
- *   Author: Andreas Dilger <adilger@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   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.
+ * This program 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 version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   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.
+ * 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
  *
- *   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.
+ * 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.
  *
- *  remote api for llog - server side
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/ptlrpc/llog_server.c
+ *
+ * remote api for llog - server side
  *
+ * Author: Andreas Dilger <adilger@clusterfs.com>
  */
 
 #define DEBUG_SUBSYSTEM S_LOG
 
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
-
 #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 <libcfs/list.h>
-#include <linux/lustre_fsfilt.h>
+#include <obd_class.h>
+#include <lustre_log.h>
+#include <lustre_net.h>
+#include <lustre_fsfilt.h>
 
-#ifdef __KERNEL__
+#if defined(__KERNEL__) && defined(LUSTRE_LOG_SERVER)
+static int llog_origin_close(const struct lu_env *env, struct llog_handle *lgh)
+{
+       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);
+}
 
+/* 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 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, size = sizeof (*body);
-        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);
-        }
+       struct obd_export       *exp = req->rq_export;
+       struct obd_device       *obd = exp->exp_obd;
+       struct obd_device       *disk_obd;
+       struct lvfs_run_ctxt     saved;
+       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(-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, "%s: opening log %s\n", obd->obd_name, name);
         }
 
-        ctxt = llog_get_context(&obd->obd_llogs, body->lgd_ctxt_idx);
-        if (ctxt == NULL)
-                GOTO(out, rc = -EINVAL);
-
-        push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+        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_open(ctxt, &loghandle, logid, name, body->lgd_llh_flags);
+       rc = llog_open(req->rq_svc_thread->t_env, ctxt, &loghandle, logid,
+                      name, LLOG_OPEN_EXISTS);
         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;
 
+       EXIT;
 out_close:
-        rc2 = llog_close(loghandle);
-        if (!rc)
-                rc = rc2;
+       llog_origin_close(req->rq_svc_thread->t_env, loghandle);
 out_pop:
-        pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-out:
-        RETURN(rc);
+       pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
+       llog_ctxt_put(ctxt);
+       return rc;
 }
+EXPORT_SYMBOL(llog_origin_handle_open);
 
-int llog_origin_handle_prev_block(struct ptlrpc_request *req)
+int llog_origin_handle_destroy(struct ptlrpc_request *req)
+{
+       struct obd_device       *disk_obd;
+       struct lvfs_run_ctxt     saved;
+       struct llogd_body       *body;
+       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;
+
+       if (!(body->lgd_llh_flags & LLOG_F_IS_PLAIN))
+               CERROR("%s: wrong llog flags %x\n",
+                      req->rq_export->exp_obd->obd_name, body->lgd_llh_flags);
+
+       ctxt = llog_get_context(req->rq_export->exp_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 = req_capsule_server_pack(&req->rq_pill);
+       /* erase only if no error and logid is valid */
+       if (rc == 0)
+               rc = llog_erase(req->rq_svc_thread->t_env, ctxt, logid, NULL);
+       pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
+       llog_ctxt_put(ctxt);
+       RETURN(rc);
+}
+EXPORT_SYMBOL(llog_origin_handle_destroy);
+
+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   *body;
+        struct llogd_body   *repbody;
         struct lvfs_run_ctxt saved;
-        struct llog_ctxt *ctxt;
-        __u32 flags;
-        __u8 *buf;
-        void * ptr;
-        int rc, rc2, size[] = {sizeof (*body), LLOG_CHUNK_SIZE};
-        ENTRY;
+        struct llog_ctxt    *ctxt;
+        __u32                flags;
+        void                *ptr;
+       int                  rc;
 
-        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);
-        }
+        ENTRY;
 
-        OBD_ALLOC(buf, LLOG_CHUNK_SIZE);
-        if (!buf)
-                GOTO(out, rc = -ENOMEM);
+        body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
+        if (body == NULL)
+                RETURN(-EFAULT);
 
-        ctxt = llog_get_context(&obd->obd_llogs, body->lgd_ctxt_idx);
-        if (ctxt == NULL)
-                GOTO(out, rc = -EINVAL);
-        push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+       ctxt = llog_get_context(req->rq_export->exp_obd, body->lgd_ctxt_idx);
+       if (ctxt == NULL)
+               RETURN(-ENODEV);
 
-        rc = llog_open(ctxt, &loghandle, &body->lgd_logid, NULL, 0);
-        if (rc)
-                GOTO(out_pop, rc);
+       disk_obd = ctxt->loc_exp->exp_obd;
+       push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
 
-        flags = body->lgd_llh_flags;
-        rc = llog_init_handle(loghandle, flags, NULL);
-        if (rc)
-                GOTO(out_close, rc);
+       rc = llog_open(req->rq_svc_thread->t_env, ctxt, &loghandle,
+                      &body->lgd_logid, NULL, LLOG_OPEN_EXISTS);
+       if (rc)
+               GOTO(out_pop, rc);
 
-        memset(buf, 0, LLOG_CHUNK_SIZE);
-        rc = llog_prev_block(loghandle, body->lgd_index, buf, LLOG_CHUNK_SIZE);
+       flags = body->lgd_llh_flags;
+       rc = llog_init_handle(req->rq_svc_thread->t_env, loghandle, flags,
+                             NULL);
         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));
-
-        ptr = lustre_msg_buf(req->rq_repmsg, 1, LLOG_CHUNK_SIZE);
-        memcpy(ptr, buf, LLOG_CHUNK_SIZE);
+        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,
+                            &body->lgd_saved_index, body->lgd_index,
+                            &body->lgd_cur_offset, ptr, LLOG_CHUNK_SIZE);
+       if (rc)
+               GOTO(out_close, rc);
+       EXIT;
 out_close:
-        rc2 = llog_close(loghandle);
-        if (!rc)
-                rc = rc2;
-
+       llog_origin_close(req->rq_svc_thread->t_env, loghandle);
 out_pop:
-        pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-        OBD_FREE(buf, LLOG_CHUNK_SIZE);
-out:
-        RETURN(rc);
+       pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
+       llog_ctxt_put(ctxt);
+       return rc;
 }
+EXPORT_SYMBOL(llog_origin_handle_next_block);
 
-int llog_origin_handle_next_block(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 llog_handle  *loghandle;
-        struct llogd_body *body;
-        struct lvfs_run_ctxt saved;
-        struct llog_ctxt *ctxt;
-        __u32 flags;
-        __u8 *buf;
-        void * ptr;
-        int size[] = {sizeof (*body),
-                      LLOG_CHUNK_SIZE};
-        int rc, rc2;
-        ENTRY;
+        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;
+        void                 *ptr;
+       int                   rc;
 
-        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);
-        }
+        ENTRY;
 
-        OBD_ALLOC(buf, LLOG_CHUNK_SIZE);
-        if (!buf)
-                GOTO(out, rc = -ENOMEM);
+        body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
+        if (body == NULL)
+                RETURN(-EFAULT);
 
-        ctxt = llog_get_context(&obd->obd_llogs, body->lgd_ctxt_idx);
-        if (ctxt == NULL)
-                GOTO(out, rc = -EINVAL);
-        push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+       ctxt = llog_get_context(req->rq_export->exp_obd, body->lgd_ctxt_idx);
+       if (ctxt == NULL)
+               RETURN(-ENODEV);
 
-        rc = llog_open(ctxt, &loghandle, &body->lgd_logid, NULL, 0);
-        if (rc)
-                GOTO(out_pop, rc);
+        disk_obd = ctxt->loc_exp->exp_obd;
+        push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
 
-        flags = body->lgd_llh_flags;
-        rc = llog_init_handle(loghandle, flags, NULL);
-        if (rc)
-                GOTO(out_close, rc);
+       rc = llog_open(req->rq_svc_thread->t_env, ctxt, &loghandle,
+                        &body->lgd_logid, NULL, LLOG_OPEN_EXISTS);
+       if (rc)
+               GOTO(out_pop, 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);
+       flags = body->lgd_llh_flags;
+       rc = llog_init_handle(req->rq_svc_thread->t_env, loghandle, flags,
+                             NULL);
         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);
-        memcpy(ptr, buf, LLOG_CHUNK_SIZE);
+        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_CHUNK_SIZE);
+       if (rc)
+               GOTO(out_close, rc);
 
+       EXIT;
 out_close:
-        rc2 = llog_close(loghandle);
-        if (!rc)
-                rc = rc2;
-
+       llog_origin_close(req->rq_svc_thread->t_env, loghandle);
 out_pop:
-        pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-        OBD_FREE(buf, LLOG_CHUNK_SIZE);
-out:
-        RETURN(rc);
+       pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
+       llog_ctxt_put(ctxt);
+       return rc;
 }
+EXPORT_SYMBOL(llog_origin_handle_prev_block);
 
 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 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[] = {sizeof (*hdr)};
-        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);
-        }
+        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;
 
-        ctxt = llog_get_context(&obd->obd_llogs, body->lgd_ctxt_idx);
-        if (ctxt == NULL)
-                GOTO(out, rc = -EINVAL);
-        push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-
-        rc = llog_open(ctxt, &loghandle, &body->lgd_logid, NULL, 0);
-        if (rc)
-                GOTO(out_pop, rc);
+        ENTRY;
 
-        /* init_handle reads the header */
-        flags = body->lgd_llh_flags;
-        rc = llog_init_handle(loghandle, flags, NULL);
-        if (rc)
-                GOTO(out_close, rc);
+        body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
+        if (body == NULL)
+                RETURN(-EFAULT);
 
-        rc = lustre_pack_reply(req, 1, size, NULL);
+       ctxt = llog_get_context(req->rq_export->exp_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_open(req->rq_svc_thread->t_env, ctxt, &loghandle,
+                      &body->lgd_logid, NULL, LLOG_OPEN_EXISTS);
+       if (rc)
+               GOTO(out_pop, 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;
+
+        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));
-
+        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;
-
+       llog_origin_close(req->rq_svc_thread->t_env, loghandle);
 out_pop:
-        pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-
-out:
-        RETURN(rc);
+       pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
+       llog_ctxt_put(ctxt);
+       return rc;
 }
+EXPORT_SYMBOL(llog_origin_handle_read_header);
 
 int llog_origin_handle_close(struct ptlrpc_request *req)
 {
-        int rc;
-
-        rc = 0;
-
-        RETURN(rc);
+        ENTRY;
+        /* Nothing to do */
+        RETURN(0);
 }
+EXPORT_SYMBOL(llog_origin_handle_close);
 
 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;
-        int num_cookies, rc = 0, err, i;
+        struct llog_ctxt *ctxt = NULL;
         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");
+                DEBUG_REQ(D_HA, req, "No llog cookies sent");
                 RETURN(-EFAULT);
         }
 
-        ctxt = llog_get_context(&obd->obd_llogs, logcookies->lgc_subsys);
-        if (ctxt == NULL) {
-                CWARN("llog subsys not setup or already cleanup\n");
-                RETURN(-ENOENT);
-        }
+       ctxt = llog_get_context(req->rq_export->exp_obd,
+                               logcookies->lgc_subsys);
+        if (ctxt == NULL)
+                RETURN(-ENODEV);
 
-        push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+        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 = llog_fsfilt_start(ctxt, inode,
-                                           FSFILT_OP_CANCEL_UNLINK, 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));
+                        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);
+               rc = llog_cat_cancel_records(req->rq_svc_thread->t_env,
+                                            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 = llog_fsfilt_commit(ctxt, inode, handle, 0);
+                err = fsfilt_commit(disk_obd, inode, handle, 0);
                 if (err) {
-                        CERROR("error committing transaction: %d\n", 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, ctxt->loc_lvfs_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);
-
-        RETURN(rc);
-}
-EXPORT_SYMBOL(llog_origin_handle_cancel);
+                CERROR("Cancel %d of %d llog-records failed: %d\n",
+                       failed, num_cookies, rc);
 
-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;
-        struct lvfs_run_ctxt saved;
-        struct llog_handle *handle = NULL;
-        char name[4][64];
-        int rc, i, l, remains = buf_len;
-        char *out = buf;
-
-        ctxt = llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT);
-        if (ctxt == NULL || mds == NULL)
-                RETURN(-EOPNOTSUPP);
-
-        push_ctxt(&saved, ctxt->loc_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_open(ctxt, &handle, NULL, name[i], 0);
-                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],
-                             handle->lgh_file->f_dentry->d_inode->i_size,
-                             handle->lgh_last_idx, uncanceled);
-                out += l;
-                remains -= l;
-
-                llog_close(handle);
-                if (remains <= 0)
-                        break;
-        }
-out_pop:
-        pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-        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;
-        struct llog_handle *handle;
-        struct llog_logid *logid;
-        struct llog_logid_rec *lir;
-        int l, rc, index, count = 0;
-        struct cb_data *cbd = (struct cb_data*)data;
-
-        if (cbd->init) {
-                out = cbd->out;
-                remains = cbd->remains;
-                cbd->init = 0;
-        }
-        ctxt = cbd->ctxt;
-
-        if (!(cat->lgh_hdr->llh_flags & LLOG_F_IS_CAT))
-                RETURN(-EINVAL);
-
-        lir = (struct llog_logid_rec *)rec;
-        logid = &lir->lid_id;
-        rc = llog_open(ctxt, &handle, logid, NULL, 0);
-        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_ogr, logid->lgl_ogen,
-                     handle->lgh_file->f_dentry->d_inode->i_size,
-                     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;
-        }
-
-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;
-        struct llog_logid *id;
-        char name[32] = CATLIST;
-        int rc;
-        struct cb_data data;
-        struct llog_ctxt *ctxt = llog_get_context(&obd->obd_llogs, 
-                                                  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);
-
-        rc = llog_get_cat_list(&obd->obd_lvfs_ctxt, obd->obd_fsops, 
-                               name, count, idarray);
-        if (rc)
-                GOTO(out_free, rc);
-
-        push_ctxt(&saved, ctxt->loc_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_open(ctxt, &handle, id, NULL, 0);
-                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",
-                             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, NULL);
-                llog_close(handle);
-
-                if (data.remains <= 0)
-                        break;
-        }
-out_pop:
-        pop_ctxt(&saved, ctxt->loc_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;
-        struct obd_device *obd = exp->exp_obd;
-        char *keyword;
-        char *buf, *reply;
-        int rc, buf_len = LLOG_CHUNK_SIZE;
-
-        OBD_ALLOC(buf, buf_len);
-        if (buf == NULL)
-                return -ENOMEM;
-        memset(buf, 0, buf_len);
-
-        keyword = lustre_msg_string(req->rq_reqmsg, 0, 0);
-
-        if (strcmp(keyword, "config") == 0) {
-                char *client = lustre_msg_string(req->rq_reqmsg, 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);
-        } else {
-                rc = -EOPNOTSUPP;
-        }
-
-        rc = lustre_pack_reply(req, 1, &buf_len, NULL);
-        if (rc)
-                GOTO(out_free, rc = -ENOMEM);
-
-        reply = lustre_msg_buf(req->rq_repmsg, 0, 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);
+        llog_ctxt_put(ctxt);
         return rc;
 }
+EXPORT_SYMBOL(llog_origin_handle_cancel);
 
 #else /* !__KERNEL__ */
 int llog_origin_handle_open(struct ptlrpc_request *req)
@@ -598,16 +434,23 @@ int llog_origin_handle_open(struct ptlrpc_request *req)
         LBUG();
         return 0;
 }
-int llog_origin_handle_prev_block(struct ptlrpc_request *req)
+
+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();