* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * 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
extern int llog_close(struct llog_handle *cathandle);
extern int llog_get_size(struct llog_handle *loghandle);
-/* llog_cat.c - catalog api */
+/* llog_cat.c - catalog api */
struct llog_process_data {
- void *lpd_data;
- llog_cb_t lpd_cb;
+ /**
+ * Any useful data needed while processing catalog. This is
+ * passed later to process callback.
+ */
+ void *lpd_data;
+ /**
+ * Catalog process callback function, called for each record
+ * in catalog.
+ */
+ llog_cb_t lpd_cb;
};
struct llog_process_cat_data {
- int first_idx;
- int last_idx;
- /* to process catalog across zero record */
+ /**
+ * Temporary stored first_idx while scanning log.
+ */
+ int lpcd_first_idx;
+ /**
+ * Temporary stored last_idx while scanning log.
+ */
+ int lpcd_last_idx;
+};
+
+struct llog_process_cat_args {
+ /**
+ * Llog context used in recovery thread on OST (recov_thread.c)
+ */
+ struct llog_ctxt *lpca_ctxt;
+ /**
+ * Llog callback used in recovery thread on OST (recov_thread.c)
+ */
+ void *lpca_cb;
+ /**
+ * Data pointer for llog callback.
+ */
+ void *lpca_arg;
};
int llog_cat_put(struct llog_handle *cathandle);
int llog_cat_cancel_records(struct llog_handle *cathandle, int count,
struct llog_cookie *cookies);
int llog_cat_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data);
+int llog_cat_process_thread(void *data);
int llog_cat_reverse_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data);
int llog_cat_set_first_idx(struct llog_handle *cathandle, int index);
struct llog_cookie *logcookies, int numcookies);
int llog_cat_initialize(struct obd_device *obd, struct obd_llog_group *olg,
- int count, struct obd_uuid *uuid);
+ int idx, struct obd_uuid *uuid);
int obd_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
struct obd_device *disk_obd, int count,
struct llog_catid *logid, struct obd_uuid *uuid);
/* llog_net.c */
int llog_initiator_connect(struct llog_ctxt *ctxt);
int llog_receptor_accept(struct llog_ctxt *ctxt, struct obd_import *imp);
-int llog_origin_connect(struct llog_ctxt *ctxt, int count,
+int llog_origin_connect(struct llog_ctxt *ctxt,
struct llog_logid *logid, struct llog_gen *gen,
struct obd_uuid *uuid);
int llog_handle_connect(struct ptlrpc_request *req);
struct lov_stripe_md *lsm, int count,
struct llog_cookie *cookies, int flags);
int llog_obd_repl_sync(struct llog_ctxt *ctxt, struct obd_export *exp);
-int llog_repl_connect(struct llog_ctxt *ctxt, int count,
- struct llog_logid *logid, struct llog_gen *gen,
- struct obd_uuid *uuid);
+int llog_obd_repl_connect(struct llog_ctxt *ctxt,
+ struct llog_logid *logid, struct llog_gen *gen,
+ struct obd_uuid *uuid);
struct llog_operations {
int (*lop_write_rec)(struct llog_handle *loghandle,
struct llog_cookie *logcookies, int numcookies);
int (*lop_cancel)(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm,
int count, struct llog_cookie *cookies, int flags);
- int (*lop_connect)(struct llog_ctxt *ctxt, int count,
+ int (*lop_connect)(struct llog_ctxt *ctxt,
struct llog_logid *logid, struct llog_gen *gen,
struct obd_uuid *uuid);
/* XXX add 2 more: commit callbacks and llog recovery functions */
/* llog_lvfs.c */
extern struct llog_operations llog_lvfs_ops;
int llog_get_cat_list(struct obd_device *obd, struct obd_device *disk_obd,
- char *name, int count, struct llog_catid *idarray);
+ char *name, int idx, int count,
+ struct llog_catid *idarray);
+
+int llog_put_cat_list(struct obd_device *obd, struct obd_device *disk_obd,
+ char *name, int idx, int count, struct llog_catid *idarray);
struct llog_ctxt {
int loc_idx; /* my index the obd array of ctxt's */
struct llog_gen loc_gen;
struct obd_device *loc_obd; /* points back to the containing obd*/
- struct obd_llog_group *loc_olg; /* group containing that ctxt */
+ struct obd_llog_group *loc_olg; /* group containing that ctxt */
struct obd_export *loc_exp; /* parent "disk" export (e.g. MDS) */
struct obd_import *loc_imp; /* to use in RPC's: can be backward
pointing import */
struct llog_operations *loc_logops;
struct llog_handle *loc_handle;
+ struct llog_commit_master *loc_lcm;
struct llog_canceld_ctxt *loc_llcd;
struct semaphore loc_sem; /* protects loc_llcd and loc_imp */
- atomic_t loc_refcount;
- struct llog_commit_master *loc_lcm;
+ atomic_t loc_refcount;
void *llog_proc_cb;
};
-#ifndef __KERNEL__
-
-#define cap_raise(c, flag) do {} while(0)
+#define LCM_NAME_SIZE 64
+
+struct llog_commit_master {
+ /**
+ * Thread control flags (start, stop, etc.)
+ */
+ long lcm_flags;
+ /**
+ * Number of llcds onthis lcm.
+ */
+ atomic_t lcm_count;
+ /**
+ * Ptlrpc requests set. All cancel rpcs go via this request set.
+ */
+ struct ptlrpc_request_set *lcm_set;
+ /**
+ * Thread control structure. Used for control commit thread.
+ */
+ struct ptlrpcd_ctl lcm_pc;
+ /**
+ * Busy resources waitq
+ */
+ cfs_waitq_t lcm_waitq;
+ /**
+ * Commit thread name buffer. Only used for thread start.
+ */
+ char lcm_name[LCM_NAME_SIZE];
+};
-#define CAP_SYS_RESOURCE 24
+struct llog_canceld_ctxt {
+ /**
+ * Llog context this llcd is attached to. Used for accessing
+ * ->loc_import and others in process of canceling cookies
+ * gathered in this llcd.
+ */
+ struct llog_ctxt *llcd_ctxt;
+ /**
+ * Cancel thread control stucture pointer. Used for accessing
+ * it to see if should stop processing and other needs.
+ */
+ struct llog_commit_master *llcd_lcm;
+ /**
+ * Maximal llcd size. Used in calculations on how much of room
+ * left in llcd to cookie comming cookies.
+ */
+ int llcd_size;
+ /**
+ * Current llcd size while gathering cookies. This should not be
+ * more than ->llcd_size. Used for determining if we need to
+ * send this llcd (if full) and allocate new one. This is also
+ * used for copying new cookie at the end of buffer.
+ */
+ int llcd_cookiebytes;
+ /**
+ * Pointer to the start of cookies buffer.
+ */
+ struct llog_cookie llcd_cookies[0];
+};
-#endif /* !__KERNEL__ */
+/* ptlrpc/recov_thread.c */
+extern struct llog_commit_master *llog_recov_thread_init(char *name);
+extern void llog_recov_thread_fini(struct llog_commit_master *lcm,
+ int force);
+extern int llog_recov_thread_start(struct llog_commit_master *lcm);
+extern void llog_recov_thread_stop(struct llog_commit_master *lcm,
+ int force);
static inline void llog_gen_init(struct llog_ctxt *ctxt)
{
{
if (ctxt == NULL)
return;
- CDEBUG(D_INFO, "PUTting ctxt %p : new refcount %d\n", ctxt,
- atomic_read(&ctxt->loc_refcount) - 1);
LASSERT(atomic_read(&ctxt->loc_refcount) > 0);
LASSERT(atomic_read(&ctxt->loc_refcount) < 0x5a5a5a);
+ CDEBUG(D_INFO, "PUTting ctxt %p : new refcount %d\n", ctxt,
+ atomic_read(&ctxt->loc_refcount) - 1);
__llog_ctxt_put(ctxt);
}
{
cfs_waitq_init(&olg->olg_waitq);
spin_lock_init(&olg->olg_lock);
+ sema_init(&olg->olg_cat_processing, 1);
olg->olg_group = group;
}
int numcookies, void *buf, int idx)
{
struct llog_operations *lop;
- __u32 cap;
- int rc, buflen;
+ int raised, rc, buflen;
ENTRY;
rc = llog_handle2ops(handle, &lop);
buflen = rec->lrh_len;
LASSERT(size_round(buflen) == buflen);
- cap = current->cap_effective;
- cap_raise(current->cap_effective, CAP_SYS_RESOURCE);
+ raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
+ if (!raised)
+ cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
rc = lop->lop_write_rec(handle, rec, logcookies, numcookies, buf, idx);
- current->cap_effective = cap;
+ if (!raised)
+ cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
RETURN(rc);
}
struct llog_logid *logid, char *name)
{
struct llog_operations *lop;
- __u32 cap;
- int rc;
+ int raised, rc;
ENTRY;
rc = llog_obd2ops(ctxt, &lop);
if (lop->lop_create == NULL)
RETURN(-EOPNOTSUPP);
- cap = current->cap_effective;
- cap_raise(current->cap_effective, CAP_SYS_RESOURCE);
+ raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
+ if (!raised)
+ cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
rc = lop->lop_create(ctxt, res, logid, name);
- current->cap_effective = cap;
+ if (!raised)
+ cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
RETURN(rc);
}
-static inline int llog_connect(struct llog_ctxt *ctxt, int count,
+static inline int llog_connect(struct llog_ctxt *ctxt,
struct llog_logid *logid, struct llog_gen *gen,
struct obd_uuid *uuid)
{
if (lop->lop_connect == NULL)
RETURN(-EOPNOTSUPP);
- rc = lop->lop_connect(ctxt, count, logid, gen, uuid);
+ rc = lop->lop_connect(ctxt, logid, gen, uuid);
RETURN(rc);
}