#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_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;
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);
+ 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, NULL, 1, cookie, 0);
+ llog_cancel(ctxt, 1, cookie, 0, NULL);
} else
CERROR("no valid context for group "LPU64"\n",
cookie->lgc_lgl.lgl_ogr);
- } else
- CERROR("unknown 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));
}
else
rc = LLOG_PROC_BREAK;
CWARN("fetch generation log, send cookie\n");
- llog_cancel(ctxt, NULL, 1, &cookie, 0);
+ llog_cancel(ctxt, 1, &cookie, 0, NULL);
RETURN(rc);
}
obdo_free(oa);
if (rc == -ENOENT) {
CDEBUG(D_HA, "object already removed, send cookie\n");
- llog_cancel(ctxt, NULL, 1, &cookie, 0);
+ llog_cancel(ctxt, 1, &cookie, 0, NULL);
RETURN(0);
}