#include <linux/module.h>
#include <linux/version.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/obd_class.h>
#include <linux/lustre_fsfilt.h>
#include <linux/lustre_commit_confd.h>
#include "filter_internal.h"
-int filter_log_sz_change(struct llog_handle *cathandle,
- struct ll_fid *mds_fid,
- __u32 io_epoch,
+int filter_log_sz_change(struct obd_device *obd,
+ struct lustre_id *id, __u32 io_epoch,
struct llog_cookie *logcookie,
struct inode *inode)
{
struct llog_size_change_rec *lsc;
- int rc;
struct ost_filterdata *ofd;
+ struct llog_ctxt *ctxt;
+ int rc;
ENTRY;
down(&inode->i_sem);
- ofd = inode->i_filterdata;
+ ofd = (struct ost_filterdata *) LUSTRE_FILTERDATA(inode);
if (ofd && ofd->ofd_epoch >= io_epoch) {
if (ofd->ofd_epoch > io_epoch)
if (!ofd)
GOTO(out, rc = -ENOMEM);
igrab(inode);
- inode->i_filterdata = ofd;
+ LUSTRE_FILTERDATA(inode) = (void *) ofd;
ofd->ofd_epoch = io_epoch;
}
/* the decision to write a record is now made, unlock */
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);
+ CDEBUG(D_ERROR, "new epoch %lu for "DLID4"\n",
+ (unsigned long) io_epoch, OLID4(id));
+
+ ctxt = llog_get_context(&obd->obd_llogs, LLOG_SIZE_ORIG_CTXT);
+ rc = llog_add(ctxt, &lsc->lsc_hdr, NULL, logcookie, 1, NULL,NULL,NULL);
OBD_FREE(lsc, sizeof(*lsc));
if (rc > 0) {
rc = 0;
}
- out:
+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,
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);
} 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));
}