X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdfilter%2Ffilter_log.c;h=c271382683d9b67502b2a9408d19d6018114ca83;hb=9d4b898b1c1c7c318fda5f0c345ed726c774c06a;hp=8e2e1884a87c6c8a31d351b01bf758b157c75536;hpb=45d054e77353bf5b09637923e5abeb3e72a997fd;p=fs%2Flustre-release.git diff --git a/lustre/obdfilter/filter_log.c b/lustre/obdfilter/filter_log.c index 8e2e188..c271382 100644 --- a/lustre/obdfilter/filter_log.c +++ b/lustre/obdfilter/filter_log.c @@ -38,8 +38,7 @@ #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) { @@ -77,7 +76,7 @@ int filter_log_sz_change(struct llog_handle *cathandle, 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, @@ -92,7 +91,8 @@ int filter_log_sz_change(struct llog_handle *cathandle, 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, @@ -103,7 +103,7 @@ 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); @@ -112,8 +112,9 @@ void filter_cancel_cookies_cb(struct obd_device *obd, __u64 transno, } 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)); }