From 99d501a0cbd0195d3235dbb91b95952bad938cfa Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Mon, 17 Feb 2020 14:46:54 +1100 Subject: [PATCH] LU-10467 lfsck: use wait_event_idle() This l_wait_event() call is equivalent to the more standard wait_event_idle(). So switch over to wait_event_idle(). Signed-off-by: Mr NeilBrown Change-Id: I8e13360a40dd1eec740f597d649c0f230533eb3d Reviewed-on: https://review.whamcloud.com/37610 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Shaun Tancheff Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lustre/lfsck/lfsck_engine.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lustre/lfsck/lfsck_engine.c b/lustre/lfsck/lfsck_engine.c index 914ad83..3d0b80e 100644 --- a/lustre/lfsck/lfsck_engine.c +++ b/lustre/lfsck/lfsck_engine.c @@ -1585,7 +1585,6 @@ int lfsck_assistant_engine(void *args) struct ptlrpc_thread *athread = &lad->lad_thread; struct lfsck_assistant_operations *lao = lad->lad_ops; struct lfsck_assistant_req *lar; - struct l_wait_info lwi = { 0 }; int rc = 0; int rc1 = 0; int rc2; @@ -1646,12 +1645,11 @@ int lfsck_assistant_engine(void *args) GOTO(cleanup, rc); } - l_wait_event(athread->t_ctl_waitq, - !lfsck_assistant_req_empty(lad) || - test_bit(LAD_EXIT, &lad->lad_flags) || - test_bit(LAD_TO_POST, &lad->lad_flags) || - test_bit(LAD_TO_DOUBLE_SCAN, &lad->lad_flags), - &lwi); + wait_event_idle(athread->t_ctl_waitq, + !lfsck_assistant_req_empty(lad) || + test_bit(LAD_EXIT, &lad->lad_flags) || + test_bit(LAD_TO_POST, &lad->lad_flags) || + test_bit(LAD_TO_DOUBLE_SCAN, &lad->lad_flags)); if (unlikely(test_bit(LAD_EXIT, &lad->lad_flags))) GOTO(cleanup, rc = lad->lad_post_result); -- 1.8.3.1