LU-9679 modules: Use LIST_HEAD for declaring list_heads

[fs/lustre-release.git] / lustre / mgs / mgs_nids.c

diff --git a/lustre/mgs/mgs_nids.c b/lustre/mgs/mgs_nids.c
index b285e1f..2da7902 100644 (file)
--- a/lustre/mgs/mgs_nids.c
+++ b/lustre/mgs/mgs_nids.c
@@ -363,7 +363,7 @@ out:
 static void mgs_nidtbl_fini_fs(struct fs_db *fsdb)
 {
        struct mgs_nidtbl *tbl = &fsdb->fsdb_nidtbl;
-       struct list_head head = LIST_HEAD_INIT(head);
+       LIST_HEAD(head);
 
        mutex_lock(&tbl->mn_lock);
        tbl->mn_nr_targets = 0;
@@ -434,12 +434,10 @@ static int mgs_ir_notify(void *arg)
        set_user_nice(current, -2);
        mgc_fsname2resid(fsdb->fsdb_name, &resid, CONFIG_T_RECOVER);
        while (1) {
-               struct l_wait_info   lwi = { 0 };
+               wait_event_idle(fsdb->fsdb_notify_waitq,
+                               fsdb->fsdb_notify_stop ||
+                               atomic_read(&fsdb->fsdb_notify_phase));
 
-               l_wait_event(fsdb->fsdb_notify_waitq,
-                            fsdb->fsdb_notify_stop ||
-                            atomic_read(&fsdb->fsdb_notify_phase),
-                            &lwi);
                if (fsdb->fsdb_notify_stop)
                        break;
 
@@ -924,7 +922,7 @@ void mgs_fsc_cleanup(struct obd_export *exp)
 {
        struct mgs_export_data *data = &exp->u.eu_mgs_data;
        struct mgs_fsc *fsc, *tmp;
-       struct list_head head = LIST_HEAD_INIT(head);
+       LIST_HEAD(head);
 
        spin_lock(&data->med_lock);
        list_splice_init(&data->med_clients, &head);