From: Mr NeilBrown <neilb@suse.de>
Date: Mon, 17 Feb 2020 03:45:31 +0000 (+1100)
Subject: LU-10467 ldlm: use wait_event_idle() instead of l_wait_event
X-Git-Tag: 2.13.53~201
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=8284e02eb1631321c07767ed2d1db627592f0b4c;p=fs%2Flustre-release.git

LU-10467 ldlm: use wait_event_idle() instead of l_wait_event

This l_wait_event() is equivalent to wait_event_idle() which is now
supported in lustre.  So switch over to it.

Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: If1ee81a0d562516534665d049fb24c1f39b59b95
Reviewed-on: https://review.whamcloud.com/37609
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/ldlm/ldlm_inodebits.c b/lustre/ldlm/ldlm_inodebits.c
index 095c6e5..9193ba5 100644
--- a/lustre/ldlm/ldlm_inodebits.c
+++ b/lustre/ldlm/ldlm_inodebits.c
@@ -443,11 +443,9 @@ int ldlm_cli_inodebits_convert(struct ldlm_lock *lock,
 	/* Lock is being converted already */
 	if (ldlm_is_converting(lock)) {
 		if (!(cancel_flags & LCF_ASYNC)) {
-			struct l_wait_info lwi = { 0 };
-
 			unlock_res_and_lock(lock);
-			l_wait_event(lock->l_waitq,
-				     is_lock_converted(lock), &lwi);
+			wait_event_idle(lock->l_waitq,
+					is_lock_converted(lock));
 			lock_res_and_lock(lock);
 		}
 		RETURN(0);