staging/lustre/llog: remove unused server code
authorArnd Bergmann <arnd@arndb.de>
Sun, 27 Sep 2015 20:45:40 +0000 (16:45 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Sep 2015 02:06:18 +0000 (04:06 +0200)
Most of the code in llog.c and llog_cat.c is completely unused
on the client and can be removed, as a preparation for removing
the dt_object code.

Two tricky parts are:

 - In llog_cat_close(), we rely on the fact that llh_flags never
   contains LLOG_F_ZAP_WHEN_EMPTY, because nobody ever sets that
   flag.

 - In llog_read_header(), we check the return value of the lpi_cb
   callback, and again we know that it cannot be LLOG_PROC_BREAK
   or LLOG_DEL_RECORD and can remove the respective code path.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/include/lustre_log.h
drivers/staging/lustre/lustre/obdclass/llog.c
drivers/staging/lustre/lustre/obdclass/llog_cat.c
drivers/staging/lustre/lustre/obdclass/llog_internal.h
drivers/staging/lustre/lustre/obdclass/llog_obd.c
drivers/staging/lustre/lustre/ptlrpc/llog_client.c

index 2187fb615e9a874e85cb73f0a50eb7a62e9897e1..958d012a438823aed2b0fd2eebe78bd4e7562775 100644 (file)
@@ -58,7 +58,6 @@
 
 #include "obd_class.h"
 #include "lustre/lustre_idl.h"
-#include "dt_object.h"
 
 #define LOG_NAME_LIMIT(logname, name)             \
        snprintf(logname, sizeof(logname), "LOGS/%s", name)
@@ -117,24 +116,15 @@ struct llog_handle;
 /* llog.c  -  general API */
 int llog_init_handle(const struct lu_env *env, struct llog_handle *handle,
                     int flags, struct obd_uuid *uuid);
-int llog_copy_handler(const struct lu_env *env, struct llog_handle *llh,
-                     struct llog_rec_hdr *rec, void *data);
 int llog_process(const struct lu_env *env, struct llog_handle *loghandle,
                 llog_cb_t cb, void *data, void *catdata);
 int llog_process_or_fork(const struct lu_env *env,
                         struct llog_handle *loghandle,
                         llog_cb_t cb, void *data, void *catdata, bool fork);
-int llog_reverse_process(const struct lu_env *env,
-                        struct llog_handle *loghandle, llog_cb_t cb,
-                        void *data, void *catdata);
-int llog_cancel_rec(const struct lu_env *env, struct llog_handle *loghandle,
-                   int index);
 int llog_open(const struct lu_env *env, struct llog_ctxt *ctxt,
              struct llog_handle **lgh, struct llog_logid *logid,
              char *name, enum llog_open_param open_param);
 int llog_close(const struct lu_env *env, struct llog_handle *cathandle);
-int llog_is_empty(const struct lu_env *env, struct llog_ctxt *ctxt,
-                 char *name);
 int llog_backup(const struct lu_env *env, struct obd_device *obd,
                struct llog_ctxt *ctxt, struct llog_ctxt *bak_ctxt,
                char *name, char *backup);
@@ -172,29 +162,14 @@ struct llog_process_cat_data {
        int               lpcd_last_idx;
 };
 
+struct thandle;
+
 int llog_cat_close(const struct lu_env *env, struct llog_handle *cathandle);
-int llog_cat_add_rec(const struct lu_env *env, struct llog_handle *cathandle,
-                    struct llog_rec_hdr *rec, struct llog_cookie *reccookie,
-                    void *buf, struct thandle *th);
-int llog_cat_declare_add_rec(const struct lu_env *env,
-                            struct llog_handle *cathandle,
-                            struct llog_rec_hdr *rec, struct thandle *th);
-int llog_cat_add(const struct lu_env *env, struct llog_handle *cathandle,
-                struct llog_rec_hdr *rec, struct llog_cookie *reccookie,
-                void *buf);
-int llog_cat_cancel_records(const struct lu_env *env,
-                           struct llog_handle *cathandle, int count,
-                           struct llog_cookie *cookies);
 int llog_cat_process_or_fork(const struct lu_env *env,
                             struct llog_handle *cat_llh, llog_cb_t cb,
                             void *data, int startcat, int startidx, bool fork);
 int llog_cat_process(const struct lu_env *env, struct llog_handle *cat_llh,
                     llog_cb_t cb, void *data, int startcat, int startidx);
-int llog_cat_reverse_process(const struct lu_env *env,
-                            struct llog_handle *cat_llh, llog_cb_t cb,
-                            void *data);
-int llog_cat_init_and_process(const struct lu_env *env,
-                             struct llog_handle *llh);
 
 /* llog_obd.c */
 int llog_setup(const struct lu_env *env, struct obd_device *obd,
@@ -202,16 +177,11 @@ int llog_setup(const struct lu_env *env, struct obd_device *obd,
               struct obd_device *disk_obd, struct llog_operations *op);
 int __llog_ctxt_put(const struct lu_env *env, struct llog_ctxt *ctxt);
 int llog_cleanup(const struct lu_env *env, struct llog_ctxt *);
-int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp, int flags);
-int llog_cancel(const struct lu_env *env, struct llog_ctxt *ctxt,
-               struct llog_cookie *cookies, int flags);
 
 /* llog_net.c */
 int llog_initiator_connect(struct llog_ctxt *ctxt);
 
 struct llog_operations {
-       int (*lop_destroy)(const struct lu_env *env,
-                          struct llog_handle *handle);
        int (*lop_next_block)(const struct lu_env *env, struct llog_handle *h,
                              int *curr_idx, int next_idx, __u64 *offset,
                              void *buf, int len);
@@ -254,8 +224,6 @@ struct llog_operations {
        int (*lop_declare_create)(const struct lu_env *env,
                                  struct llog_handle *handle,
                                  struct thandle *th);
-       int (*lop_create)(const struct lu_env *env, struct llog_handle *handle,
-                         struct thandle *th);
        /**
         * write new record in llog. It appends records usually but can edit
         * existing records too.
@@ -287,8 +255,6 @@ struct llog_handle {
        spinlock_t               lgh_hdr_lock; /* protect lgh_hdr data */
        struct llog_logid        lgh_id; /* id of this log */
        struct llog_log_hdr     *lgh_hdr;
-       struct file             *lgh_file;
-       struct dt_object        *lgh_obj;
        int                      lgh_last_idx;
        int                      lgh_cur_idx; /* used during llog_process */
        __u64                    lgh_cur_offset; /* used during llog_process */
@@ -318,7 +284,6 @@ struct llog_ctxt {
        struct mutex             loc_mutex; /* protect loc_imp */
        atomic_t             loc_refcount;
        long                 loc_flags; /* flags, see above defines */
-       struct dt_object        *loc_dir;
 };
 
 #define LLOG_PROC_BREAK 0x0001
@@ -440,22 +405,6 @@ static inline int llog_ctxt_null(struct obd_device *obd, int index)
        return llog_group_ctxt_null(&obd->obd_olg, index);
 }
 
-static inline int llog_destroy(const struct lu_env *env,
-                              struct llog_handle *handle)
-{
-       struct llog_operations *lop;
-       int rc;
-
-       rc = llog_handle2ops(handle, &lop);
-       if (rc)
-               return rc;
-       if (lop->lop_destroy == NULL)
-               return -EOPNOTSUPP;
-
-       rc = lop->lop_destroy(env, handle);
-       return rc;
-}
-
 static inline int llog_next_block(const struct lu_env *env,
                                  struct llog_handle *loghandle, int *cur_idx,
                                  int next_idx, __u64 *cur_offset, void *buf,
@@ -510,11 +459,6 @@ static inline int llog_connect(struct llog_ctxt *ctxt,
 }
 
 /* llog.c */
-int llog_exist(struct llog_handle *loghandle);
-int llog_declare_create(const struct lu_env *env,
-                       struct llog_handle *loghandle, struct thandle *th);
-int llog_create(const struct lu_env *env, struct llog_handle *handle,
-               struct thandle *th);
 int llog_declare_write_rec(const struct lu_env *env,
                           struct llog_handle *handle,
                           struct llog_rec_hdr *rec, int idx,
@@ -522,24 +466,10 @@ int llog_declare_write_rec(const struct lu_env *env,
 int llog_write_rec(const struct lu_env *env, struct llog_handle *handle,
                   struct llog_rec_hdr *rec, struct llog_cookie *logcookies,
                   int numcookies, void *buf, int idx, struct thandle *th);
-int llog_add(const struct lu_env *env, struct llog_handle *lgh,
-            struct llog_rec_hdr *rec, struct llog_cookie *logcookies,
-            void *buf, struct thandle *th);
-int llog_declare_add(const struct lu_env *env, struct llog_handle *lgh,
-                    struct llog_rec_hdr *rec, struct thandle *th);
 int lustre_process_log(struct super_block *sb, char *logname,
                       struct config_llog_instance *cfg);
 int lustre_end_log(struct super_block *sb, char *logname,
                   struct config_llog_instance *cfg);
-int llog_open_create(const struct lu_env *env, struct llog_ctxt *ctxt,
-                    struct llog_handle **res, struct llog_logid *logid,
-                    char *name);
-int llog_erase(const struct lu_env *env, struct llog_ctxt *ctxt,
-              struct llog_logid *logid, char *name);
-int llog_write(const struct lu_env *env, struct llog_handle *loghandle,
-              struct llog_rec_hdr *rec, struct llog_cookie *reccookie,
-              int cookiecount, void *buf, int idx);
-
 /** @} log */
 
 #endif
index 8cad470804567171b86a32c51cf157e0c3055968..a941518e463d7fa2b3d133cbc3192f343f60b75d 100644 (file)
@@ -105,66 +105,6 @@ void llog_handle_put(struct llog_handle *loghandle)
                llog_free_handle(loghandle);
 }
 
-/* returns negative on error; 0 if success; 1 if success & log destroyed */
-int llog_cancel_rec(const struct lu_env *env, struct llog_handle *loghandle,
-                   int index)
-{
-       struct llog_log_hdr *llh = loghandle->lgh_hdr;
-       int rc = 0;
-
-       CDEBUG(D_RPCTRACE, "Canceling %d in log "DOSTID"\n",
-              index, POSTID(&loghandle->lgh_id.lgl_oi));
-
-       if (index == 0) {
-               CERROR("Can't cancel index 0 which is header\n");
-               return -EINVAL;
-       }
-
-       spin_lock(&loghandle->lgh_hdr_lock);
-       if (!ext2_clear_bit(index, llh->llh_bitmap)) {
-               spin_unlock(&loghandle->lgh_hdr_lock);
-               CDEBUG(D_RPCTRACE, "Catalog index %u already clear?\n", index);
-               return -ENOENT;
-       }
-
-       llh->llh_count--;
-
-       if ((llh->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) &&
-           (llh->llh_count == 1) &&
-           (loghandle->lgh_last_idx == (LLOG_BITMAP_BYTES * 8) - 1)) {
-               spin_unlock(&loghandle->lgh_hdr_lock);
-               rc = llog_destroy(env, loghandle);
-               if (rc < 0) {
-                       CERROR("%s: can't destroy empty llog #"DOSTID
-                              "#%08x: rc = %d\n",
-                              loghandle->lgh_ctxt->loc_obd->obd_name,
-                              POSTID(&loghandle->lgh_id.lgl_oi),
-                              loghandle->lgh_id.lgl_ogen, rc);
-                       goto out_err;
-               }
-               return 1;
-       }
-       spin_unlock(&loghandle->lgh_hdr_lock);
-
-       rc = llog_write(env, loghandle, &llh->llh_hdr, NULL, 0, NULL, 0);
-       if (rc < 0) {
-               CERROR("%s: fail to write header for llog #"DOSTID
-                      "#%08x: rc = %d\n",
-                      loghandle->lgh_ctxt->loc_obd->obd_name,
-                      POSTID(&loghandle->lgh_id.lgl_oi),
-                      loghandle->lgh_id.lgl_ogen, rc);
-               goto out_err;
-       }
-       return 0;
-out_err:
-       spin_lock(&loghandle->lgh_hdr_lock);
-       ext2_set_bit(index, llh->llh_bitmap);
-       llh->llh_count++;
-       spin_unlock(&loghandle->lgh_hdr_lock);
-       return rc;
-}
-EXPORT_SYMBOL(llog_cancel_rec);
-
 static int llog_read_header(const struct lu_env *env,
                            struct llog_handle *handle,
                            struct obd_uuid *uuid)
@@ -373,14 +313,6 @@ repeat:
                                rc = lpi->lpi_cb(lpi->lpi_env, loghandle, rec,
                                                 lpi->lpi_cbdata);
                                last_called_index = index;
-                               if (rc == LLOG_PROC_BREAK) {
-                                       goto out;
-                               } else if (rc == LLOG_DEL_RECORD) {
-                                       llog_cancel_rec(lpi->lpi_env,
-                                                       loghandle,
-                                                       rec->lrh_index);
-                                       rc = 0;
-                               }
                                if (rc)
                                        goto out;
                        } else {
@@ -475,380 +407,6 @@ int llog_process(const struct lu_env *env, struct llog_handle *loghandle,
 }
 EXPORT_SYMBOL(llog_process);
 
-int llog_reverse_process(const struct lu_env *env,
-                        struct llog_handle *loghandle, llog_cb_t cb,
-                        void *data, void *catdata)
-{
-       struct llog_log_hdr *llh = loghandle->lgh_hdr;
-       struct llog_process_cat_data *cd = catdata;
-       void *buf;
-       int rc = 0, first_index = 1, index, idx;
-
-       buf = kzalloc(LLOG_CHUNK_SIZE, GFP_NOFS);
-       if (!buf)
-               return -ENOMEM;
-
-       if (cd != NULL)
-               first_index = cd->lpcd_first_idx + 1;
-       if (cd != NULL && cd->lpcd_last_idx)
-               index = cd->lpcd_last_idx;
-       else
-               index = LLOG_BITMAP_BYTES * 8 - 1;
-
-       while (rc == 0) {
-               struct llog_rec_hdr *rec;
-               struct llog_rec_tail *tail;
-
-               /* skip records not set in bitmap */
-               while (index >= first_index &&
-                      !ext2_test_bit(index, llh->llh_bitmap))
-                       --index;
-
-               LASSERT(index >= first_index - 1);
-               if (index == first_index - 1)
-                       break;
-
-               /* get the buf with our target record; avoid old garbage */
-               memset(buf, 0, LLOG_CHUNK_SIZE);
-               rc = llog_prev_block(env, loghandle, index, buf,
-                                    LLOG_CHUNK_SIZE);
-               if (rc)
-                       goto out;
-
-               rec = buf;
-               idx = rec->lrh_index;
-               CDEBUG(D_RPCTRACE, "index %u : idx %u\n", index, idx);
-               while (idx < index) {
-                       rec = (void *)rec + rec->lrh_len;
-                       if (LLOG_REC_HDR_NEEDS_SWABBING(rec))
-                               lustre_swab_llog_rec(rec);
-                       idx++;
-               }
-               LASSERT(idx == index);
-               tail = (void *)rec + rec->lrh_len - sizeof(*tail);
-
-               /* process records in buffer, starting where we found one */
-               while ((void *)tail > buf) {
-                       if (tail->lrt_index == 0) {
-                               /* no more records */
-                               rc = 0;
-                               goto out;
-                       }
-
-                       /* if set, process the callback on this record */
-                       if (ext2_test_bit(index, llh->llh_bitmap)) {
-                               rec = (void *)tail - tail->lrt_len +
-                                     sizeof(*tail);
-
-                               rc = cb(env, loghandle, rec, data);
-                               if (rc == LLOG_PROC_BREAK) {
-                                       goto out;
-                               } else if (rc == LLOG_DEL_RECORD) {
-                                       llog_cancel_rec(env, loghandle,
-                                                       tail->lrt_index);
-                                       rc = 0;
-                               }
-                               if (rc)
-                                       goto out;
-                       }
-
-                       /* previous record, still in buffer? */
-                       --index;
-                       if (index < first_index) {
-                               rc = 0;
-                               goto out;
-                       }
-                       tail = (void *)tail - tail->lrt_len;
-               }
-       }
-
-out:
-       kfree(buf);
-       return rc;
-}
-EXPORT_SYMBOL(llog_reverse_process);
-
-/**
- * new llog API
- *
- * API functions:
- *      llog_open - open llog, may not exist
- *      llog_exist - check if llog exists
- *      llog_close - close opened llog, pair for open, frees llog_handle
- *      llog_declare_create - declare llog creation
- *      llog_create - create new llog on disk, need transaction handle
- *      llog_declare_write_rec - declaration of llog write
- *      llog_write_rec - write llog record on disk, need transaction handle
- *      llog_declare_add - declare llog catalog record addition
- *      llog_add - add llog record in catalog, need transaction handle
- */
-int llog_exist(struct llog_handle *loghandle)
-{
-       struct llog_operations  *lop;
-       int                      rc;
-
-       rc = llog_handle2ops(loghandle, &lop);
-       if (rc)
-               return rc;
-       if (lop->lop_exist == NULL)
-               return -EOPNOTSUPP;
-
-       rc = lop->lop_exist(loghandle);
-       return rc;
-}
-EXPORT_SYMBOL(llog_exist);
-
-int llog_declare_create(const struct lu_env *env,
-                       struct llog_handle *loghandle, struct thandle *th)
-{
-       struct llog_operations  *lop;
-       int                      raised, rc;
-
-       rc = llog_handle2ops(loghandle, &lop);
-       if (rc)
-               return rc;
-       if (lop->lop_declare_create == NULL)
-               return -EOPNOTSUPP;
-
-       raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
-       if (!raised)
-               cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
-       rc = lop->lop_declare_create(env, loghandle, th);
-       if (!raised)
-               cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
-       return rc;
-}
-EXPORT_SYMBOL(llog_declare_create);
-
-int llog_create(const struct lu_env *env, struct llog_handle *handle,
-               struct thandle *th)
-{
-       struct llog_operations  *lop;
-       int                      raised, rc;
-
-       rc = llog_handle2ops(handle, &lop);
-       if (rc)
-               return rc;
-       if (lop->lop_create == NULL)
-               return -EOPNOTSUPP;
-
-       raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
-       if (!raised)
-               cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
-       rc = lop->lop_create(env, handle, th);
-       if (!raised)
-               cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
-       return rc;
-}
-EXPORT_SYMBOL(llog_create);
-
-int llog_declare_write_rec(const struct lu_env *env,
-                          struct llog_handle *handle,
-                          struct llog_rec_hdr *rec, int idx,
-                          struct thandle *th)
-{
-       struct llog_operations  *lop;
-       int                      raised, rc;
-
-       rc = llog_handle2ops(handle, &lop);
-       if (rc)
-               return rc;
-       LASSERT(lop);
-       if (lop->lop_declare_write_rec == NULL)
-               return -EOPNOTSUPP;
-
-       raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
-       if (!raised)
-               cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
-       rc = lop->lop_declare_write_rec(env, handle, rec, idx, th);
-       if (!raised)
-               cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
-       return rc;
-}
-EXPORT_SYMBOL(llog_declare_write_rec);
-
-int llog_write_rec(const struct lu_env *env, struct llog_handle *handle,
-                  struct llog_rec_hdr *rec, struct llog_cookie *logcookies,
-                  int numcookies, void *buf, int idx, struct thandle *th)
-{
-       struct llog_operations  *lop;
-       int                      raised, rc, buflen;
-
-       rc = llog_handle2ops(handle, &lop);
-       if (rc)
-               return rc;
-
-       LASSERT(lop);
-       if (lop->lop_write_rec == NULL)
-               return -EOPNOTSUPP;
-
-       if (buf)
-               buflen = rec->lrh_len + sizeof(struct llog_rec_hdr) +
-                        sizeof(struct llog_rec_tail);
-       else
-               buflen = rec->lrh_len;
-       LASSERT(cfs_size_round(buflen) == buflen);
-
-       raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
-       if (!raised)
-               cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
-       rc = lop->lop_write_rec(env, handle, rec, logcookies, numcookies,
-                               buf, idx, th);
-       if (!raised)
-               cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
-       return rc;
-}
-EXPORT_SYMBOL(llog_write_rec);
-
-int llog_add(const struct lu_env *env, struct llog_handle *lgh,
-            struct llog_rec_hdr *rec, struct llog_cookie *logcookies,
-            void *buf, struct thandle *th)
-{
-       int raised, rc;
-
-       if (lgh->lgh_logops->lop_add == NULL)
-               return -EOPNOTSUPP;
-
-       raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
-       if (!raised)
-               cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
-       rc = lgh->lgh_logops->lop_add(env, lgh, rec, logcookies, buf, th);
-       if (!raised)
-               cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
-       return rc;
-}
-EXPORT_SYMBOL(llog_add);
-
-int llog_declare_add(const struct lu_env *env, struct llog_handle *lgh,
-                    struct llog_rec_hdr *rec, struct thandle *th)
-{
-       int raised, rc;
-
-       if (lgh->lgh_logops->lop_declare_add == NULL)
-               return -EOPNOTSUPP;
-
-       raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
-       if (!raised)
-               cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
-       rc = lgh->lgh_logops->lop_declare_add(env, lgh, rec, th);
-       if (!raised)
-               cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
-       return rc;
-}
-EXPORT_SYMBOL(llog_declare_add);
-
-/**
- * Helper function to open llog or create it if doesn't exist.
- * It hides all transaction handling from caller.
- */
-int llog_open_create(const struct lu_env *env, struct llog_ctxt *ctxt,
-                    struct llog_handle **res, struct llog_logid *logid,
-                    char *name)
-{
-       struct dt_device        *d;
-       struct thandle          *th;
-       int                      rc;
-
-       rc = llog_open(env, ctxt, res, logid, name, LLOG_OPEN_NEW);
-       if (rc)
-               return rc;
-
-       if (llog_exist(*res))
-               return 0;
-
-       LASSERT((*res)->lgh_obj != NULL);
-
-       d = lu2dt_dev((*res)->lgh_obj->do_lu.lo_dev);
-
-       th = dt_trans_create(env, d);
-       if (IS_ERR(th)) {
-               rc = PTR_ERR(th);
-               goto out;
-       }
-
-       rc = llog_declare_create(env, *res, th);
-       if (rc == 0) {
-               rc = dt_trans_start_local(env, d, th);
-               if (rc == 0)
-                       rc = llog_create(env, *res, th);
-       }
-       dt_trans_stop(env, d, th);
-out:
-       if (rc)
-               llog_close(env, *res);
-       return rc;
-}
-EXPORT_SYMBOL(llog_open_create);
-
-/**
- * Helper function to delete existent llog.
- */
-int llog_erase(const struct lu_env *env, struct llog_ctxt *ctxt,
-              struct llog_logid *logid, char *name)
-{
-       struct llog_handle      *handle;
-       int                      rc = 0, rc2;
-
-       /* nothing to erase */
-       if (name == NULL && logid == NULL)
-               return 0;
-
-       rc = llog_open(env, ctxt, &handle, logid, name, LLOG_OPEN_EXISTS);
-       if (rc < 0)
-               return rc;
-
-       rc = llog_init_handle(env, handle, LLOG_F_IS_PLAIN, NULL);
-       if (rc == 0)
-               rc = llog_destroy(env, handle);
-
-       rc2 = llog_close(env, handle);
-       if (rc == 0)
-               rc = rc2;
-       return rc;
-}
-EXPORT_SYMBOL(llog_erase);
-
-/*
- * Helper function for write record in llog.
- * It hides all transaction handling from caller.
- * Valid only with local llog.
- */
-int llog_write(const struct lu_env *env, struct llog_handle *loghandle,
-              struct llog_rec_hdr *rec, struct llog_cookie *reccookie,
-              int cookiecount, void *buf, int idx)
-{
-       struct dt_device        *dt;
-       struct thandle          *th;
-       int                      rc;
-
-       LASSERT(loghandle);
-       LASSERT(loghandle->lgh_ctxt);
-       LASSERT(loghandle->lgh_obj != NULL);
-
-       dt = lu2dt_dev(loghandle->lgh_obj->do_lu.lo_dev);
-
-       th = dt_trans_create(env, dt);
-       if (IS_ERR(th))
-               return PTR_ERR(th);
-
-       rc = llog_declare_write_rec(env, loghandle, rec, idx, th);
-       if (rc)
-               goto out_trans;
-
-       rc = dt_trans_start_local(env, dt, th);
-       if (rc)
-               goto out_trans;
-
-       down_write(&loghandle->lgh_lock);
-       rc = llog_write_rec(env, loghandle, rec, reccookie,
-                           cookiecount, buf, idx, th);
-       up_write(&loghandle->lgh_lock);
-out_trans:
-       dt_trans_stop(env, dt, th);
-       return rc;
-}
-EXPORT_SYMBOL(llog_write);
-
 int llog_open(const struct lu_env *env, struct llog_ctxt *ctxt,
              struct llog_handle **lgh, struct llog_logid *logid,
              char *name, enum llog_open_param open_param)
@@ -902,105 +460,3 @@ out:
        return rc;
 }
 EXPORT_SYMBOL(llog_close);
-
-int llog_is_empty(const struct lu_env *env, struct llog_ctxt *ctxt,
-                 char *name)
-{
-       struct llog_handle      *llh;
-       int                      rc;
-
-       rc = llog_open(env, ctxt, &llh, NULL, name, LLOG_OPEN_EXISTS);
-       if (rc < 0) {
-               if (likely(rc == -ENOENT))
-                       rc = 0;
-               goto out;
-       }
-
-       rc = llog_init_handle(env, llh, LLOG_F_IS_PLAIN, NULL);
-       if (rc)
-               goto out_close;
-       rc = llog_get_size(llh);
-
-out_close:
-       llog_close(env, llh);
-out:
-       /* header is record 1 */
-       return rc <= 1;
-}
-EXPORT_SYMBOL(llog_is_empty);
-
-int llog_copy_handler(const struct lu_env *env, struct llog_handle *llh,
-                     struct llog_rec_hdr *rec, void *data)
-{
-       struct llog_handle      *copy_llh = data;
-
-       /* Append all records */
-       return llog_write(env, copy_llh, rec, NULL, 0, NULL, -1);
-}
-EXPORT_SYMBOL(llog_copy_handler);
-
-/* backup plain llog */
-int llog_backup(const struct lu_env *env, struct obd_device *obd,
-               struct llog_ctxt *ctxt, struct llog_ctxt *bctxt,
-               char *name, char *backup)
-{
-       struct llog_handle      *llh, *bllh;
-       int                      rc;
-
-
-
-       /* open original log */
-       rc = llog_open(env, ctxt, &llh, NULL, name, LLOG_OPEN_EXISTS);
-       if (rc < 0) {
-               /* the -ENOENT case is also reported to the caller
-                * but silently so it should handle that if needed.
-                */
-               if (rc != -ENOENT)
-                       CERROR("%s: failed to open log %s: rc = %d\n",
-                              obd->obd_name, name, rc);
-               return rc;
-       }
-
-       rc = llog_init_handle(env, llh, LLOG_F_IS_PLAIN, NULL);
-       if (rc)
-               goto out_close;
-
-       /* Make sure there's no old backup log */
-       rc = llog_erase(env, bctxt, NULL, backup);
-       if (rc < 0 && rc != -ENOENT)
-               goto out_close;
-
-       /* open backup log */
-       rc = llog_open_create(env, bctxt, &bllh, NULL, backup);
-       if (rc) {
-               CERROR("%s: failed to open backup logfile %s: rc = %d\n",
-                      obd->obd_name, backup, rc);
-               goto out_close;
-       }
-
-       /* check that backup llog is not the same object as original one */
-       if (llh->lgh_obj == bllh->lgh_obj) {
-               CERROR("%s: backup llog %s to itself (%s), objects %p/%p\n",
-                      obd->obd_name, name, backup, llh->lgh_obj,
-                      bllh->lgh_obj);
-               rc = -EEXIST;
-               goto out_backup;
-       }
-
-       rc = llog_init_handle(env, bllh, LLOG_F_IS_PLAIN, NULL);
-       if (rc)
-               goto out_backup;
-
-       /* Copy log record by record */
-       rc = llog_process_or_fork(env, llh, llog_copy_handler, (void *)bllh,
-                                 NULL, false);
-       if (rc)
-               CERROR("%s: failed to backup log %s: rc = %d\n",
-                      obd->obd_name, name, rc);
-out_backup:
-       llog_close(env, bllh);
-out_close:
-       llog_close(env, llh);
-       return rc;
-}
-EXPORT_SYMBOL(llog_backup);
index 48dbbcf977020d150a6898f8bcd734b3c1718d4d..3984445f84420c9e5c525cf030cd9626631433ed 100644 (file)
 
 #include "llog_internal.h"
 
-/* Create a new log handle and add it to the open list.
- * This log handle will be closed when all of the records in it are removed.
- *
- * Assumes caller has already pushed us into the kernel context and is locking.
- */
-static int llog_cat_new_log(const struct lu_env *env,
-                           struct llog_handle *cathandle,
-                           struct llog_handle *loghandle,
-                           struct thandle *th)
-{
-
-       struct llog_log_hdr *llh;
-       struct llog_logid_rec rec = { { 0 }, };
-       int rc, index, bitmap_size;
-
-       llh = cathandle->lgh_hdr;
-       bitmap_size = LLOG_BITMAP_SIZE(llh);
-
-       index = (cathandle->lgh_last_idx + 1) % bitmap_size;
-
-       /* maximum number of available slots in catlog is bitmap_size - 2 */
-       if (llh->llh_cat_idx == index) {
-               CERROR("no free catalog slots for log...\n");
-               return -ENOSPC;
-       }
-
-       if (OBD_FAIL_CHECK(OBD_FAIL_MDS_LLOG_CREATE_FAILED))
-               return -ENOSPC;
-
-       rc = llog_create(env, loghandle, th);
-       /* if llog is already created, no need to initialize it */
-       if (rc == -EEXIST) {
-               return 0;
-       } else if (rc != 0) {
-               CERROR("%s: can't create new plain llog in catalog: rc = %d\n",
-                      loghandle->lgh_ctxt->loc_obd->obd_name, rc);
-               return rc;
-       }
-
-       rc = llog_init_handle(env, loghandle,
-                             LLOG_F_IS_PLAIN | LLOG_F_ZAP_WHEN_EMPTY,
-                             &cathandle->lgh_hdr->llh_tgtuuid);
-       if (rc)
-               goto out_destroy;
-
-       if (index == 0)
-               index = 1;
-
-       spin_lock(&loghandle->lgh_hdr_lock);
-       llh->llh_count++;
-       if (ext2_set_bit(index, llh->llh_bitmap)) {
-               CERROR("argh, index %u already set in log bitmap?\n",
-                      index);
-               spin_unlock(&loghandle->lgh_hdr_lock);
-               LBUG(); /* should never happen */
-       }
-       spin_unlock(&loghandle->lgh_hdr_lock);
-
-       cathandle->lgh_last_idx = index;
-       llh->llh_tail.lrt_index = index;
-
-       CDEBUG(D_RPCTRACE,
-              "new recovery log "DOSTID":%x for index %u of catalog"
-              DOSTID"\n", POSTID(&loghandle->lgh_id.lgl_oi),
-              loghandle->lgh_id.lgl_ogen, index,
-              POSTID(&cathandle->lgh_id.lgl_oi));
-       /* build the record for this log in the catalog */
-       rec.lid_hdr.lrh_len = sizeof(rec);
-       rec.lid_hdr.lrh_index = index;
-       rec.lid_hdr.lrh_type = LLOG_LOGID_MAGIC;
-       rec.lid_id = loghandle->lgh_id;
-       rec.lid_tail.lrt_len = sizeof(rec);
-       rec.lid_tail.lrt_index = index;
-
-       /* update the catalog: header and record */
-       rc = llog_write_rec(env, cathandle, &rec.lid_hdr,
-                           &loghandle->u.phd.phd_cookie, 1, NULL, index, th);
-       if (rc < 0)
-               goto out_destroy;
-
-       loghandle->lgh_hdr->llh_cat_idx = index;
-       return 0;
-out_destroy:
-       llog_destroy(env, loghandle);
-       return rc;
-}
-
 /* Open an existent log handle and add it to the open list.
  * This log handle will be closed when all of the records in it are removed.
  *
@@ -217,24 +130,8 @@ int llog_cat_close(const struct lu_env *env, struct llog_handle *cathandle)
 
        list_for_each_entry_safe(loghandle, n, &cathandle->u.chd.chd_head,
                                     u.phd.phd_entry) {
-               struct llog_log_hdr     *llh = loghandle->lgh_hdr;
-               int                      index;
-
                /* unlink open-not-created llogs */
                list_del_init(&loghandle->u.phd.phd_entry);
-               llh = loghandle->lgh_hdr;
-               if (loghandle->lgh_obj != NULL && llh != NULL &&
-                   (llh->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) &&
-                   (llh->llh_count == 1)) {
-                       rc = llog_destroy(env, loghandle);
-                       if (rc)
-                               CERROR("%s: failure destroying log during cleanup: rc = %d\n",
-                                      loghandle->lgh_ctxt->loc_obd->obd_name,
-                                      rc);
-
-                       index = loghandle->u.phd.phd_cookie.lgc_index;
-                       llog_cat_cleanup(env, cathandle, NULL, index);
-               }
                llog_close(env, loghandle);
        }
        /* if handle was stored in ctxt, remove it too */
@@ -245,285 +142,6 @@ int llog_cat_close(const struct lu_env *env, struct llog_handle *cathandle)
 }
 EXPORT_SYMBOL(llog_cat_close);
 
-/**
- * lockdep markers for nested struct llog_handle::lgh_lock locking.
- */
-enum {
-       LLOGH_CAT,
-       LLOGH_LOG
-};
-
-/** Return the currently active log handle.  If the current log handle doesn't
- * have enough space left for the current record, start a new one.
- *
- * If reclen is 0, we only want to know what the currently active log is,
- * otherwise we get a lock on this log so nobody can steal our space.
- *
- * Assumes caller has already pushed us into the kernel context and is locking.
- *
- * NOTE: loghandle is write-locked upon successful return
- */
-static struct llog_handle *llog_cat_current_log(struct llog_handle *cathandle,
-                                               struct thandle *th)
-{
-       struct llog_handle *loghandle = NULL;
-
-       down_read_nested(&cathandle->lgh_lock, LLOGH_CAT);
-       loghandle = cathandle->u.chd.chd_current_log;
-       if (loghandle) {
-               struct llog_log_hdr *llh;
-
-               down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
-               llh = loghandle->lgh_hdr;
-               if (llh == NULL ||
-                   loghandle->lgh_last_idx < LLOG_BITMAP_SIZE(llh) - 1) {
-                       up_read(&cathandle->lgh_lock);
-                       return loghandle;
-               }
-               up_write(&loghandle->lgh_lock);
-       }
-       up_read(&cathandle->lgh_lock);
-
-       /* time to use next log */
-
-       /* first, we have to make sure the state hasn't changed */
-       down_write_nested(&cathandle->lgh_lock, LLOGH_CAT);
-       loghandle = cathandle->u.chd.chd_current_log;
-       if (loghandle) {
-               struct llog_log_hdr *llh;
-
-               down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
-               llh = loghandle->lgh_hdr;
-               LASSERT(llh);
-               if (loghandle->lgh_last_idx < LLOG_BITMAP_SIZE(llh) - 1) {
-                       up_write(&cathandle->lgh_lock);
-                       return loghandle;
-               }
-               up_write(&loghandle->lgh_lock);
-       }
-
-       CDEBUG(D_INODE, "use next log\n");
-
-       loghandle = cathandle->u.chd.chd_next_log;
-       cathandle->u.chd.chd_current_log = loghandle;
-       cathandle->u.chd.chd_next_log = NULL;
-       down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
-       up_write(&cathandle->lgh_lock);
-       LASSERT(loghandle);
-       return loghandle;
-}
-
-/* Add a single record to the recovery log(s) using a catalog
- * Returns as llog_write_record
- *
- * Assumes caller has already pushed us into the kernel context.
- */
-int llog_cat_add_rec(const struct lu_env *env, struct llog_handle *cathandle,
-                    struct llog_rec_hdr *rec, struct llog_cookie *reccookie,
-                    void *buf, struct thandle *th)
-{
-       struct llog_handle *loghandle;
-       int rc;
-
-       LASSERT(rec->lrh_len <= LLOG_CHUNK_SIZE);
-       loghandle = llog_cat_current_log(cathandle, th);
-       LASSERT(!IS_ERR(loghandle));
-
-       /* loghandle is already locked by llog_cat_current_log() for us */
-       if (!llog_exist(loghandle)) {
-               rc = llog_cat_new_log(env, cathandle, loghandle, th);
-               if (rc < 0) {
-                       up_write(&loghandle->lgh_lock);
-                       return rc;
-               }
-       }
-       /* now let's try to add the record */
-       rc = llog_write_rec(env, loghandle, rec, reccookie, 1, buf, -1, th);
-       if (rc < 0)
-               CDEBUG_LIMIT(rc == -ENOSPC ? D_HA : D_ERROR,
-                            "llog_write_rec %d: lh=%p\n", rc, loghandle);
-       up_write(&loghandle->lgh_lock);
-       if (rc == -ENOSPC) {
-               /* try to use next log */
-               loghandle = llog_cat_current_log(cathandle, th);
-               LASSERT(!IS_ERR(loghandle));
-               /* new llog can be created concurrently */
-               if (!llog_exist(loghandle)) {
-                       rc = llog_cat_new_log(env, cathandle, loghandle, th);
-                       if (rc < 0) {
-                               up_write(&loghandle->lgh_lock);
-                               return rc;
-                       }
-               }
-               /* now let's try to add the record */
-               rc = llog_write_rec(env, loghandle, rec, reccookie, 1, buf,
-                                   -1, th);
-               if (rc < 0)
-                       CERROR("llog_write_rec %d: lh=%p\n", rc, loghandle);
-               up_write(&loghandle->lgh_lock);
-       }
-
-       return rc;
-}
-EXPORT_SYMBOL(llog_cat_add_rec);
-
-int llog_cat_declare_add_rec(const struct lu_env *env,
-                            struct llog_handle *cathandle,
-                            struct llog_rec_hdr *rec, struct thandle *th)
-{
-       struct llog_handle      *loghandle, *next;
-       int                      rc = 0;
-
-       if (cathandle->u.chd.chd_current_log == NULL) {
-               /* declare new plain llog */
-               down_write(&cathandle->lgh_lock);
-               if (cathandle->u.chd.chd_current_log == NULL) {
-                       rc = llog_open(env, cathandle->lgh_ctxt, &loghandle,
-                                      NULL, NULL, LLOG_OPEN_NEW);
-                       if (rc == 0) {
-                               cathandle->u.chd.chd_current_log = loghandle;
-                               list_add_tail(&loghandle->u.phd.phd_entry,
-                                                 &cathandle->u.chd.chd_head);
-                       }
-               }
-               up_write(&cathandle->lgh_lock);
-       } else if (cathandle->u.chd.chd_next_log == NULL) {
-               /* declare next plain llog */
-               down_write(&cathandle->lgh_lock);
-               if (cathandle->u.chd.chd_next_log == NULL) {
-                       rc = llog_open(env, cathandle->lgh_ctxt, &loghandle,
-                                      NULL, NULL, LLOG_OPEN_NEW);
-                       if (rc == 0) {
-                               cathandle->u.chd.chd_next_log = loghandle;
-                               list_add_tail(&loghandle->u.phd.phd_entry,
-                                                 &cathandle->u.chd.chd_head);
-                       }
-               }
-               up_write(&cathandle->lgh_lock);
-       }
-       if (rc)
-               goto out;
-
-       if (!llog_exist(cathandle->u.chd.chd_current_log)) {
-               rc = llog_declare_create(env, cathandle->u.chd.chd_current_log,
-                                        th);
-               if (rc)
-                       goto out;
-               llog_declare_write_rec(env, cathandle, NULL, -1, th);
-       }
-       /* declare records in the llogs */
-       rc = llog_declare_write_rec(env, cathandle->u.chd.chd_current_log,
-                                   rec, -1, th);
-       if (rc)
-               goto out;
-
-       next = cathandle->u.chd.chd_next_log;
-       if (next) {
-               if (!llog_exist(next)) {
-                       rc = llog_declare_create(env, next, th);
-                       llog_declare_write_rec(env, cathandle, NULL, -1, th);
-               }
-               llog_declare_write_rec(env, next, rec, -1, th);
-       }
-out:
-       return rc;
-}
-EXPORT_SYMBOL(llog_cat_declare_add_rec);
-
-int llog_cat_add(const struct lu_env *env, struct llog_handle *cathandle,
-                struct llog_rec_hdr *rec, struct llog_cookie *reccookie,
-                void *buf)
-{
-       struct llog_ctxt        *ctxt;
-       struct dt_device        *dt;
-       struct thandle          *th = NULL;
-       int                      rc;
-
-       ctxt = cathandle->lgh_ctxt;
-       LASSERT(ctxt);
-       LASSERT(ctxt->loc_exp);
-
-       if (cathandle->lgh_obj != NULL) {
-               dt = ctxt->loc_exp->exp_obd->obd_lvfs_ctxt.dt;
-               LASSERT(dt);
-
-               th = dt_trans_create(env, dt);
-               if (IS_ERR(th))
-                       return PTR_ERR(th);
-
-               rc = llog_cat_declare_add_rec(env, cathandle, rec, th);
-               if (rc)
-                       goto out_trans;
-
-               rc = dt_trans_start_local(env, dt, th);
-               if (rc)
-                       goto out_trans;
-               rc = llog_cat_add_rec(env, cathandle, rec, reccookie, buf, th);
-out_trans:
-               dt_trans_stop(env, dt, th);
-       } else { /* lvfs compat code */
-               LASSERT(cathandle->lgh_file != NULL);
-               rc = llog_cat_declare_add_rec(env, cathandle, rec, th);
-               if (rc == 0)
-                       rc = llog_cat_add_rec(env, cathandle, rec, reccookie,
-                                             buf, th);
-       }
-       return rc;
-}
-EXPORT_SYMBOL(llog_cat_add);
-
-/* For each cookie in the cookie array, we clear the log in-use bit and either:
- * - the log is empty, so mark it free in the catalog header and delete it
- * - the log is not empty, just write out the log header
- *
- * The cookies may be in different log files, so we need to get new logs
- * each time.
- *
- * Assumes caller has already pushed us into the kernel context.
- */
-int llog_cat_cancel_records(const struct lu_env *env,
-                           struct llog_handle *cathandle, int count,
-                           struct llog_cookie *cookies)
-{
-       int i, index, rc = 0, failed = 0;
-
-       for (i = 0; i < count; i++, cookies++) {
-               struct llog_handle      *loghandle;
-               struct llog_logid       *lgl = &cookies->lgc_lgl;
-               int                      lrc;
-
-               rc = llog_cat_id2handle(env, cathandle, &loghandle, lgl);
-               if (rc) {
-                       CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
-                              cathandle->lgh_ctxt->loc_obd->obd_name,
-                              POSTID(&lgl->lgl_oi), rc);
-                       failed++;
-                       continue;
-               }
-
-               lrc = llog_cancel_rec(env, loghandle, cookies->lgc_index);
-               if (lrc == 1) {   /* log has been destroyed */
-                       index = loghandle->u.phd.phd_cookie.lgc_index;
-                       rc = llog_cat_cleanup(env, cathandle, loghandle,
-                                             index);
-               } else if (lrc == -ENOENT) {
-                       if (rc == 0) /* ENOENT shouldn't rewrite any error */
-                               rc = lrc;
-               } else if (lrc < 0) {
-                       failed++;
-                       rc = lrc;
-               }
-               llog_handle_put(loghandle);
-       }
-       if (rc)
-               CERROR("%s: fail to cancel %d of %d llog-records: rc = %d\n",
-                      cathandle->lgh_ctxt->loc_obd->obd_name, failed, count,
-                      rc);
-
-       return rc;
-}
-EXPORT_SYMBOL(llog_cat_cancel_records);
-
 static int llog_cat_process_cb(const struct lu_env *env,
                               struct llog_handle *cat_llh,
                               struct llog_rec_hdr *rec, void *data)
@@ -619,195 +237,3 @@ int llog_cat_process(const struct lu_env *env, struct llog_handle *cat_llh,
                                        startidx, false);
 }
 EXPORT_SYMBOL(llog_cat_process);
-
-static int llog_cat_reverse_process_cb(const struct lu_env *env,
-                                      struct llog_handle *cat_llh,
-                                      struct llog_rec_hdr *rec, void *data)
-{
-       struct llog_process_data *d = data;
-       struct llog_logid_rec *lir = (struct llog_logid_rec *)rec;
-       struct llog_handle *llh;
-       int rc;
-
-       if (le32_to_cpu(rec->lrh_type) != LLOG_LOGID_MAGIC) {
-               CERROR("invalid record in catalog\n");
-               return -EINVAL;
-       }
-       CDEBUG(D_HA, "processing log "DOSTID":%x at index %u of catalog "
-              DOSTID"\n", POSTID(&lir->lid_id.lgl_oi), lir->lid_id.lgl_ogen,
-              le32_to_cpu(rec->lrh_index), POSTID(&cat_llh->lgh_id.lgl_oi));
-
-       rc = llog_cat_id2handle(env, cat_llh, &llh, &lir->lid_id);
-       if (rc) {
-               CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
-                      cat_llh->lgh_ctxt->loc_obd->obd_name,
-                      POSTID(&lir->lid_id.lgl_oi), rc);
-               return rc;
-       }
-
-       rc = llog_reverse_process(env, llh, d->lpd_cb, d->lpd_data, NULL);
-       llog_handle_put(llh);
-       return rc;
-}
-
-int llog_cat_reverse_process(const struct lu_env *env,
-                            struct llog_handle *cat_llh,
-                            llog_cb_t cb, void *data)
-{
-       struct llog_process_data d;
-       struct llog_process_cat_data cd;
-       struct llog_log_hdr *llh = cat_llh->lgh_hdr;
-       int rc;
-
-       LASSERT(llh->llh_flags & LLOG_F_IS_CAT);
-       d.lpd_data = data;
-       d.lpd_cb = cb;
-
-       if (llh->llh_cat_idx > cat_llh->lgh_last_idx) {
-               CWARN("catalog "DOSTID" crosses index zero\n",
-                     POSTID(&cat_llh->lgh_id.lgl_oi));
-
-               cd.lpcd_first_idx = 0;
-               cd.lpcd_last_idx = cat_llh->lgh_last_idx;
-               rc = llog_reverse_process(env, cat_llh,
-                                         llog_cat_reverse_process_cb,
-                                         &d, &cd);
-               if (rc != 0)
-                       return rc;
-
-               cd.lpcd_first_idx = le32_to_cpu(llh->llh_cat_idx);
-               cd.lpcd_last_idx = 0;
-               rc = llog_reverse_process(env, cat_llh,
-                                         llog_cat_reverse_process_cb,
-                                         &d, &cd);
-       } else {
-               rc = llog_reverse_process(env, cat_llh,
-                                         llog_cat_reverse_process_cb,
-                                         &d, NULL);
-       }
-
-       return rc;
-}
-EXPORT_SYMBOL(llog_cat_reverse_process);
-
-static int llog_cat_set_first_idx(struct llog_handle *cathandle, int index)
-{
-       struct llog_log_hdr *llh = cathandle->lgh_hdr;
-       int i, bitmap_size, idx;
-
-       bitmap_size = LLOG_BITMAP_SIZE(llh);
-       if (llh->llh_cat_idx == (index - 1)) {
-               idx = llh->llh_cat_idx + 1;
-               llh->llh_cat_idx = idx;
-               if (idx == cathandle->lgh_last_idx)
-                       goto out;
-               for (i = (index + 1) % bitmap_size;
-                    i != cathandle->lgh_last_idx;
-                    i = (i + 1) % bitmap_size) {
-                       if (!ext2_test_bit(i, llh->llh_bitmap)) {
-                               idx = llh->llh_cat_idx + 1;
-                               llh->llh_cat_idx = idx;
-                       } else if (i == 0) {
-                               llh->llh_cat_idx = 0;
-                       } else {
-                               break;
-                       }
-               }
-out:
-               CDEBUG(D_RPCTRACE, "set catlog "DOSTID" first idx %u\n",
-                      POSTID(&cathandle->lgh_id.lgl_oi), llh->llh_cat_idx);
-       }
-
-       return 0;
-}
-
-/* Cleanup deleted plain llog traces from catalog */
-int llog_cat_cleanup(const struct lu_env *env, struct llog_handle *cathandle,
-                    struct llog_handle *loghandle, int index)
-{
-       int rc;
-
-       LASSERT(index);
-       if (loghandle != NULL) {
-               /* remove destroyed llog from catalog list and
-                * chd_current_log variable */
-               down_write(&cathandle->lgh_lock);
-               if (cathandle->u.chd.chd_current_log == loghandle)
-                       cathandle->u.chd.chd_current_log = NULL;
-               list_del_init(&loghandle->u.phd.phd_entry);
-               up_write(&cathandle->lgh_lock);
-               LASSERT(index == loghandle->u.phd.phd_cookie.lgc_index);
-               /* llog was opened and keep in a list, close it now */
-               llog_close(env, loghandle);
-       }
-       /* remove plain llog entry from catalog by index */
-       llog_cat_set_first_idx(cathandle, index);
-       rc = llog_cancel_rec(env, cathandle, index);
-       if (rc == 0)
-               CDEBUG(D_HA, "cancel plain log at index %u of catalog " DOSTID "\n",
-                      index, POSTID(&cathandle->lgh_id.lgl_oi));
-       return rc;
-}
-
-static int cat_cancel_cb(const struct lu_env *env, struct llog_handle *cathandle,
-                 struct llog_rec_hdr *rec, void *data)
-{
-       struct llog_logid_rec   *lir = (struct llog_logid_rec *)rec;
-       struct llog_handle      *loghandle;
-       struct llog_log_hdr     *llh;
-       int                      rc;
-
-       if (rec->lrh_type != LLOG_LOGID_MAGIC) {
-               CERROR("invalid record in catalog\n");
-               return -EINVAL;
-       }
-
-       CDEBUG(D_HA, "processing log "DOSTID":%x at index %u of catalog "
-              DOSTID"\n", POSTID(&lir->lid_id.lgl_oi), lir->lid_id.lgl_ogen,
-              rec->lrh_index, POSTID(&cathandle->lgh_id.lgl_oi));
-
-       rc = llog_cat_id2handle(env, cathandle, &loghandle, &lir->lid_id);
-       if (rc) {
-               CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
-                      cathandle->lgh_ctxt->loc_obd->obd_name,
-                      POSTID(&lir->lid_id.lgl_oi), rc);
-               if (rc == -ENOENT || rc == -ESTALE) {
-                       /* remove index from catalog */
-                       llog_cat_cleanup(env, cathandle, NULL, rec->lrh_index);
-               }
-               return rc;
-       }
-
-       llh = loghandle->lgh_hdr;
-       if ((llh->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) &&
-           (llh->llh_count == 1)) {
-               rc = llog_destroy(env, loghandle);
-               if (rc)
-                       CERROR("%s: fail to destroy empty log: rc = %d\n",
-                              loghandle->lgh_ctxt->loc_obd->obd_name, rc);
-
-               llog_cat_cleanup(env, cathandle, loghandle,
-                                loghandle->u.phd.phd_cookie.lgc_index);
-       }
-       llog_handle_put(loghandle);
-
-       return rc;
-}
-
-/* helper to initialize catalog llog and process it to cancel */
-int llog_cat_init_and_process(const struct lu_env *env,
-                             struct llog_handle *llh)
-{
-       int rc;
-
-       rc = llog_init_handle(env, llh, LLOG_F_IS_CAT, NULL);
-       if (rc)
-               return rc;
-
-       rc = llog_process_or_fork(env, llh, cat_cancel_cb, NULL, NULL, false);
-       if (rc)
-               CERROR("%s: llog_process() with cat_cancel_cb failed: rc = %d\n",
-                      llh->lgh_ctxt->loc_obd->obd_name, rc);
-       return 0;
-}
-EXPORT_SYMBOL(llog_cat_init_and_process);
index c99e658e565737649cbd9fee54a67b06fce57f15..533998688fb47701187d85ba3ac2299ad30e15ee 100644 (file)
@@ -53,7 +53,6 @@ struct llog_process_info {
 struct llog_thread_info {
        struct lu_attr                   lgi_attr;
        struct lu_fid                    lgi_fid;
-       struct dt_object_format          lgi_dof;
        struct lu_buf                    lgi_buf;
        loff_t                           lgi_off;
        struct llog_rec_hdr              lgi_lrh;
@@ -62,15 +61,6 @@ struct llog_thread_info {
 
 extern struct lu_context_key llog_thread_key;
 
-static inline struct llog_thread_info *llog_info(const struct lu_env *env)
-{
-       struct llog_thread_info *lgi;
-
-       lgi = lu_context_key_get(&env->le_ctx, &llog_thread_key);
-       LASSERT(lgi);
-       return lgi;
-}
-
 int llog_info_init(void);
 void llog_info_fini(void);
 
index 81ab27e7376f125b49669ee0af2c8b30135da9c6..2b4a70b6c8d454c350ef351e6ef92b531bf44357 100644 (file)
@@ -212,36 +212,6 @@ int llog_setup(const struct lu_env *env, struct obd_device *obd,
 }
 EXPORT_SYMBOL(llog_setup);
 
-int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp, int flags)
-{
-       int rc = 0;
-
-       if (!ctxt)
-               return 0;
-
-       if (CTXTP(ctxt, sync))
-               rc = CTXTP(ctxt, sync)(ctxt, exp, flags);
-
-       return rc;
-}
-EXPORT_SYMBOL(llog_sync);
-
-int llog_cancel(const struct lu_env *env, struct llog_ctxt *ctxt,
-               struct llog_cookie *cookies, int flags)
-{
-       int rc;
-
-       if (!ctxt) {
-               CERROR("No ctxt\n");
-               return -ENODEV;
-       }
-
-       CTXT_CHECK_OP(ctxt, cancel, -EOPNOTSUPP);
-       rc = CTXTP(ctxt, cancel)(env, ctxt, cookies, flags);
-       return rc;
-}
-EXPORT_SYMBOL(llog_cancel);
-
 /* context key constructor/destructor: llog_key_init, llog_key_fini */
 LU_KEY_INIT_FINI(llog, struct llog_thread_info);
 /* context key: llog_thread_key */
index 1c701e0a0bc71b6b670d9fa5c31ff00860d3cb5d..fbb9ce8cc31a8b7a7548bb1f6b1338aabc7f65fc 100644 (file)
@@ -142,41 +142,6 @@ out:
        return rc;
 }
 
-static int llog_client_destroy(const struct lu_env *env,
-                              struct llog_handle *loghandle)
-{
-       struct obd_import *imp;
-       struct ptlrpc_request *req = NULL;
-       struct llogd_body *body;
-       int rc;
-
-       LLOG_CLIENT_ENTRY(loghandle->lgh_ctxt, imp);
-       req = ptlrpc_request_alloc_pack(imp, &RQF_LLOG_ORIGIN_HANDLE_DESTROY,
-                                       LUSTRE_LOG_VERSION,
-                                       LLOG_ORIGIN_HANDLE_DESTROY);
-       if (req == NULL) {
-               rc = -ENOMEM;
-               goto err_exit;
-       }
-
-       body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
-       body->lgd_logid = loghandle->lgh_id;
-       body->lgd_llh_flags = loghandle->lgh_hdr->llh_flags;
-
-       if (!(body->lgd_llh_flags & LLOG_F_IS_PLAIN))
-               CERROR("%s: wrong llog flags %x\n", imp->imp_obd->obd_name,
-                      body->lgd_llh_flags);
-
-       ptlrpc_request_set_replen(req);
-       rc = ptlrpc_queue_wait(req);
-
-       ptlrpc_req_finished(req);
-err_exit:
-       LLOG_CLIENT_EXIT(loghandle->lgh_ctxt, imp);
-       return rc;
-}
-
-
 static int llog_client_next_block(const struct lu_env *env,
                                  struct llog_handle *loghandle,
                                  int *cur_idx, int next_idx,
@@ -360,7 +325,6 @@ struct llog_operations llog_client_ops = {
        .lop_prev_block         = llog_client_prev_block,
        .lop_read_header        = llog_client_read_header,
        .lop_open               = llog_client_open,
-       .lop_destroy            = llog_client_destroy,
        .lop_close              = llog_client_close,
 };
 EXPORT_SYMBOL(llog_client_ops);