Whamcloud - gitweb
LU-10467 lfsck: use wait_event_idle() 10/37610/3
authorMr NeilBrown <neilb@suse.de>
Mon, 17 Feb 2020 03:46:54 +0000 (14:46 +1100)
committerOleg Drokin <green@whamcloud.com>
Tue, 25 Feb 2020 05:50:41 +0000 (05:50 +0000)
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 <neilb@suse.de>
Change-Id: I8e13360a40dd1eec740f597d649c0f230533eb3d
Reviewed-on: https://review.whamcloud.com/37610
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/lfsck/lfsck_engine.c

index 914ad83..3d0b80e 100644 (file)
@@ -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);