X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_request.c;fp=lustre%2Fldlm%2Fldlm_request.c;h=520ec17e8c913a704eadf724527e9d1585d19eff;hp=3e01725b222ed6e69fa047b7cedd38062ff45b76;hb=fa9c4d0fee01d30d538a819f370f281431a43f68;hpb=d0ca764a1a9116238f64f4f6e1ded116d5d28ed0

diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index 3e01725..520ec17 100644
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -1601,10 +1601,8 @@ int ldlm_cli_cancel(const struct lustre_handle *lockh,
 		if (cancel_flags & LCF_ASYNC) {
 			unlock_res_and_lock(lock);
 		} else {
-			struct l_wait_info lwi = { 0 };
-
 			unlock_res_and_lock(lock);
-			l_wait_event(lock->l_waitq, is_bl_done(lock), &lwi);
+			wait_event_idle(lock->l_waitq, is_bl_done(lock));
 		}
 		LDLM_LOCK_RELEASE(lock);
 		RETURN(0);