X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_lock.c;h=f49abb6bfb4fadd69668d173732be20eef6be2f8;hp=7c17a62c08dc1ca27ae4252d959cdc8c1b88dd33;hb=e88b3bf26a477a2b42182c4b451bc2fe55fa88fa;hpb=c40c7939c0110ca53151c47249d85e56a6e0f24d;ds=sidebyside diff --git a/lustre/quota/qsd_lock.c b/lustre/quota/qsd_lock.c index 7c17a62..f49abb6 100644 --- a/lustre/quota/qsd_lock.c +++ b/lustre/quota/qsd_lock.c @@ -227,10 +227,10 @@ static int qsd_glb_glimpse_ast(struct ldlm_lock *lock, void *data) /* valid race */ GOTO(out, rc = -ELDLM_NO_LOCK_DATA); - LCONSOLE_INFO("%s: glimpse on glb quota locks, id:"LPU64" ver:"LPU64 - " hard:" LPU64" soft:"LPU64"\n", qqi->qqi_qsd->qsd_svname, - desc->gl_id.qid_uid, desc->gl_ver, desc->gl_hardlimit, - desc->gl_softlimit); + CDEBUG(D_QUOTA, "%s: glimpse on glb quota locks, id:"LPU64" ver:"LPU64 + " hard:" LPU64" soft:"LPU64"\n", qqi->qqi_qsd->qsd_svname, + desc->gl_id.qid_uid, desc->gl_ver, desc->gl_hardlimit, + desc->gl_softlimit); if (desc->gl_ver == 0) { CERROR("%s: invalid global index version "LPU64"\n", @@ -339,7 +339,7 @@ static int qsd_id_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *de * which means there could be a short window that slave is * holding spare grant wihtout per-ID lock. */ if (rel) - rc = qsd_dqacq(env, lqe, QSD_REL); + rc = qsd_adjust(env, lqe); /* release lqe reference grabbed by qsd_id_ast_data_get() */ lqe_putref(lqe); @@ -380,8 +380,8 @@ static int qsd_id_glimpse_ast(struct ldlm_lock *lock, void *data) /* valid race */ GOTO(out, rc = -ELDLM_NO_LOCK_DATA); - LQUOTA_CONSOLE(lqe, "glimpse on quota locks, new qunit:"LPU64, - desc->gl_qunit); + LQUOTA_DEBUG(lqe, "glimpse on quota locks, new qunit:"LPU64, + desc->gl_qunit); qsd = lqe2qqi(lqe)->qqi_qsd; @@ -400,14 +400,14 @@ static int qsd_id_glimpse_ast(struct ldlm_lock *lock, void *data) if (space > 0) { if (lqe->lqe_pending_req > 0) { - LQUOTA_ERROR(lqe, "request in flight, postpone " + LQUOTA_DEBUG(lqe, "request in flight, postpone " "release of "LPD64, space); lvb->lvb_id_may_rel = space; } else { lqe->lqe_pending_req++; /* release quota space in glimpse reply */ - LQUOTA_ERROR(lqe, "releasing "LPD64, space); + LQUOTA_DEBUG(lqe, "releasing "LPD64, space); lqe->lqe_granted -= space; lvb->lvb_id_rel = space;