#include "filter_internal.h"
int filter_log_sz_change(struct llog_handle *cathandle,
- struct ll_fid *mds_fid,
- __u32 io_epoch,
+ struct lustre_id *id, __u32 io_epoch,
struct llog_cookie *logcookie,
struct inode *inode)
{
RETURN(-ENOMEM);
lsc->lsc_hdr.lrh_len = lsc->lsc_tail.lrt_len = sizeof(*lsc);
lsc->lsc_hdr.lrh_type = OST_SZ_REC;
- lsc->lsc_fid = *mds_fid;
+ lsc->lsc_id = *id;
lsc->lsc_io_epoch = io_epoch;
- rc = llog_cat_add_rec(cathandle, &lsc->lsc_hdr, logcookie, NULL);
+ rc = llog_cat_add_rec(cathandle, &lsc->lsc_hdr, logcookie,
+ NULL, NULL, NULL);
OBD_FREE(lsc, sizeof(*lsc));
if (rc > 0) {
out:
RETURN(rc);
}
+struct obd_llogs * filter_grab_llog_for_group(struct obd_device *,
+ int, struct obd_export *);
/* When this (destroy) operation is committed, return the cancel cookie */
void filter_cancel_cookies_cb(struct obd_device *obd, __u64 transno,
- void *cb_data, int error)
+ void *cb_data, int error)
{
struct llog_cookie *cookie = cb_data;
- llog_cancel(llog_get_context(obd, cookie->lgc_subsys + 1),
- NULL, 1, cookie, 0);
- //NULL, 1, cookie, OBD_LLOG_FL_SENDNOW);
+ struct obd_llogs *llogs = NULL;
+ struct llog_ctxt *ctxt;
+
+ /* we have to find context for right group */
+ llogs = filter_grab_llog_for_group(obd, cookie->lgc_lgl.lgl_ogr, NULL);
+
+ if (llogs) {
+ ctxt = llog_get_context(llogs, cookie->lgc_subsys + 1);
+ if (ctxt) {
+ llog_cancel(ctxt, 1, cookie, 0, NULL);
+ } else
+ CERROR("no valid context for group "LPU64"\n",
+ cookie->lgc_lgl.lgl_ogr);
+ } else {
+ CDEBUG(D_HA, "unknown group "LPU64"!\n", cookie->lgc_lgl.lgl_ogr);
+ }
+
OBD_FREE(cb_data, sizeof(struct llog_cookie));
}
struct obd_device *obd = ctxt->loc_obd;
struct obd_export *exp = obd->obd_self_export;
struct llog_cookie cookie;
+ struct llog_gen_rec *lgr;
struct llog_unlink_rec *lur;
struct obdo *oa;
- struct obd_trans_info oti = { 0 };
obd_id oid;
int rc = 0;
ENTRY;
-
- if (!le32_to_cpu(llh->lgh_hdr->llh_flags) & LLOG_F_IS_PLAIN) {
+
+ if (!(le32_to_cpu(llh->lgh_hdr->llh_flags) & LLOG_F_IS_PLAIN)) {
CERROR("log is not plain\n");
RETURN(-EINVAL);
}
- if (rec->lrh_type != MDS_UNLINK_REC) {
+ if (rec->lrh_type != MDS_UNLINK_REC &&
+ rec->lrh_type != LLOG_GEN_REC) {
CERROR("log record type error\n");
RETURN(-EINVAL);
}
cookie.lgc_lgl = llh->lgh_id;
cookie.lgc_subsys = LLOG_UNLINK_ORIG_CTXT;
cookie.lgc_index = le32_to_cpu(rec->lrh_index);
-
+
+ if (rec->lrh_type == LLOG_GEN_REC) {
+ lgr = (struct llog_gen_rec *)rec;
+ if (llog_gen_lt(lgr->lgr_gen, ctxt->loc_gen))
+ rc = 0;
+ else
+ rc = LLOG_PROC_BREAK;
+ CWARN("fetch generation log, send cookie\n");
+ llog_cancel(ctxt, 1, &cookie, 0, NULL);
+ RETURN(rc);
+ }
+
lur = (struct llog_unlink_rec *)rec;
-
oa = obdo_alloc();
if (oa == NULL)
RETURN(-ENOMEM);
oa->o_valid |= OBD_MD_FLCOOKIE;
oa->o_id = lur->lur_oid;
oa->o_gr = lur->lur_ogen;
+ oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
memcpy(obdo_logcookie(oa), &cookie, sizeof(cookie));
oid = oa->o_id;
- rc = obd_destroy(exp, oa, NULL, &oti);
+ rc = obd_destroy(exp, oa, NULL, NULL);
obdo_free(oa);
if (rc == -ENOENT) {
- CWARN("object already removed: send cookie\n");
- llog_cancel(ctxt, NULL, 1, &cookie, 0);
+ CDEBUG(D_HA, "object already removed, send cookie\n");
+ llog_cancel(ctxt, 1, &cookie, 0, NULL);
RETURN(0);
}
if (rc == 0)
- CWARN("object: "LPU64" in record is destroyed\n", oid);
+ CDEBUG(D_HA, "object: "LPU64" in record is destroyed\n", oid);
RETURN(rc);
}