From 8284e02eb1631321c07767ed2d1db627592f0b4c Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Mon, 17 Feb 2020 14:45:31 +1100 Subject: [PATCH] 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 Change-Id: If1ee81a0d562516534665d049fb24c1f39b59b95 Reviewed-on: https://review.whamcloud.com/37609 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Shaun Tancheff Reviewed-by: Oleg Drokin --- lustre/ldlm/ldlm_inodebits.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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); -- 1.8.3.1