From: tappro Date: Thu, 7 Sep 2006 15:02:33 +0000 (+0000) Subject: - change debug level for object init/fini messages X-Git-Tag: v1_8_0_110~486^2~989 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=ec29f14a8d50f7bf56a783f920a70fb134abcb53;p=fs%2Flustre-release.git - change debug level for object init/fini messages - do osd_sync() in osd_device_fini() - add debug message in assert for lu_device refcount --- diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index 2839ea9..b7b9eff 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -2830,7 +2830,7 @@ static int mdt_object_init(const struct lu_context *ctxt, struct lu_object *o) int rc = 0; ENTRY; - CDEBUG(D_INODE, "object init, fid = "DFID"\n", + CDEBUG(D_INFO, "object init, fid = "DFID"\n", PFID(lu_object_fid(o))); under = &d->mdt_child->md_lu_dev; @@ -2849,7 +2849,7 @@ static void mdt_object_free(const struct lu_context *ctxt, struct lu_object *o) ENTRY; h = o->lo_header; - CDEBUG(D_INODE, "object free, fid = "DFID"\n", + CDEBUG(D_INFO, "object free, fid = "DFID"\n", PFID(lu_object_fid(o))); lu_object_fini(o); diff --git a/lustre/obdclass/lu_object.c b/lustre/obdclass/lu_object.c index 0d6e692..99c436d 100644 --- a/lustre/obdclass/lu_object.c +++ b/lustre/obdclass/lu_object.c @@ -574,7 +574,8 @@ EXPORT_SYMBOL(lu_device_init); */ void lu_device_fini(struct lu_device *d) { - LASSERT(atomic_read(&d->ld_ref) == 0); + LASSERTF(atomic_read(&d->ld_ref) == 0, + "Refcount is %u\n", atomic_read(&d->ld_ref)); } EXPORT_SYMBOL(lu_device_fini); diff --git a/lustre/osd/osd_handler.c b/lustre/osd/osd_handler.c index b689aa67..06f983c 100644 --- a/lustre/osd/osd_handler.c +++ b/lustre/osd/osd_handler.c @@ -566,17 +566,12 @@ static void osd_trans_stop(const struct lu_context *ctx, struct thandle *th) EXIT; } -static int osd_sync(const struct lu_context *ctx, - struct dt_device *d) +static int osd_sync(const struct lu_context *ctx, struct dt_device *d) { CDEBUG(D_HA, "syncing OSD %s\n", LUSTRE_OSD_NAME); return ldiskfs_force_commit(osd_sb(osd_dt_dev(d))); } -enum { - SYNC_DEVICE_CREDITS = 3 -}; - static void osd_ro(const struct lu_context *ctx, struct dt_device *d) { ENTRY; @@ -1870,6 +1865,7 @@ static struct lu_device *osd_device_fini(const struct lu_context *ctx, ENTRY; shrink_dcache_sb(osd_sb(osd_dev(d))); + osd_sync(ctx, lu2dt_dev(d)); if (osd_dev(d)->od_mount) server_put_mount(osd_dev(d)->od_mount->lmi_name,