From 2166e349e71672085357052cb3a8fd4b56de5c85 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 3 Aug 2005 07:34:22 +0000 Subject: [PATCH] b=7237 - missed wake_up() has been returned - few CDEBUG() have changed their level to D_ERROR to simplify debugging --- lustre/obdfilter/filter.c | 6 +++--- lustre/osc/osc_create.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c index 1652e69..088550d 100644 --- a/lustre/obdfilter/filter.c +++ b/lustre/obdfilter/filter.c @@ -2493,7 +2493,7 @@ filter_clear_orphans(struct obd_export *exp, struct obdo *oa) GOTO(out_free_doa, 0); } - CWARN("%s:["LPU64"] deleting orphan objects from "LPU64" to " + CDEBUG(D_ERROR, "%s:["LPU64"] deleting orphan objects from "LPU64" to " LPU64"\n", exp->exp_obd->obd_name, doa->o_gr, oa->o_id + 1, last); @@ -2502,8 +2502,8 @@ filter_clear_orphans(struct obd_export *exp, struct obdo *oa) filter_destroy(exp, doa, NULL, NULL); } - CDEBUG(D_HA, "%s:["LPU64"] after destroy: set last_objids = " - LPU64"\n", exp->exp_obd->obd_name, doa->o_gr, oa->o_id); + CDEBUG(D_ERROR, "%s:["LPU64"] after destroy: set last_objids = " + LPU64"\n", exp->exp_obd->obd_name, doa->o_gr, last + 1); /* return next free id to be used as a new start of sequence -bzzz */ oa->o_id = last + 1; diff --git a/lustre/osc/osc_create.c b/lustre/osc/osc_create.c index 3a25414..4202edc 100644 --- a/lustre/osc/osc_create.c +++ b/lustre/osc/osc_create.c @@ -120,6 +120,7 @@ int osc_create(struct obd_export *exp, struct obdo *oa, oscc->oscc_flags &= ~OSCC_FLAG_RECOVERING; CDEBUG(D_HA, "%s: oscc recovery finished: %d\n", oscc->oscc_obd->obd_name, rc); + wake_up(&oscc->oscc_waitq); } else { CDEBUG(D_ERROR, "%s: oscc recovery failed: %d\n", oscc->oscc_obd->obd_name, rc); @@ -142,7 +143,7 @@ int osc_create(struct obd_export *exp, struct obdo *oa, !oscc_recovering(oscc), &lwi); LASSERT(rc == 0 || rc == -ETIMEDOUT); if (rc == -ETIMEDOUT) { - CDEBUG(D_HA,"%p: timeout waiting on recovery\n", + CDEBUG(D_ERROR,"%p: timeout waiting on recovery\n", oscc); RETURN(rc); } -- 1.8.3.1