LU-4788 lfsck: replace cfs_list_t with list_head

[fs/lustre-release.git] / lustre / lfsck / lfsck_namespace.c

diff --git a/lustre/lfsck/lfsck_namespace.c b/lustre/lfsck/lfsck_namespace.c
index a2c07aa..2c8918e 100644 (file)
--- a/lustre/lfsck/lfsck_namespace.c
+++ b/lustre/lfsck/lfsck_namespace.c
@@ -793,11 +793,10 @@ static int lfsck_namespace_prep(const struct lu_env *env,
                if (!lfsck->li_drop_dryrun ||
                    lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent)) {
                        ns->ln_status = LS_SCANNING_PHASE2;
-                       cfs_list_del_init(&com->lc_link);
-                       cfs_list_add_tail(&com->lc_link,
-                                         &lfsck->li_list_double_scan);
-                       if (!cfs_list_empty(&com->lc_link_dir))
-                               cfs_list_del_init(&com->lc_link_dir);
+                       list_move_tail(&com->lc_link,
+                                      &lfsck->li_list_double_scan);
+                       if (!list_empty(&com->lc_link_dir))
+                               list_del_init(&com->lc_link_dir);
                        lfsck_pos_set_zero(pos);
                } else {
                        ns->ln_status = LS_SCANNING_PHASE1;
@@ -814,16 +813,16 @@ static int lfsck_namespace_prep(const struct lu_env *env,
                        ns->ln_objs_nlink_repaired = 0;
                        ns->ln_objs_lost_found = 0;
                        fid_zero(&ns->ln_fid_latest_scanned_phase2);
-                       if (cfs_list_empty(&com->lc_link_dir))
-                               cfs_list_add_tail(&com->lc_link_dir,
-                                                 &lfsck->li_list_dir);
+                       if (list_empty(&com->lc_link_dir))
+                               list_add_tail(&com->lc_link_dir,
+                                             &lfsck->li_list_dir);
                        *pos = ns->ln_pos_first_inconsistent;
                }
        } else {
                ns->ln_status = LS_SCANNING_PHASE1;
-               if (cfs_list_empty(&com->lc_link_dir))
-                       cfs_list_add_tail(&com->lc_link_dir,
-                                         &lfsck->li_list_dir);
+               if (list_empty(&com->lc_link_dir))
+                       list_add_tail(&com->lc_link_dir,
+                                     &lfsck->li_list_dir);
                if (!lfsck->li_drop_dryrun ||
                    lfsck_pos_is_zero(&ns->ln_pos_first_inconsistent)) {
                        *pos = ns->ln_pos_last_checkpoint;
@@ -1091,23 +1090,20 @@ static int lfsck_namespace_post(const struct lu_env *env,
                ns->ln_status = LS_SCANNING_PHASE2;
                ns->ln_flags |= LF_SCANNED_ONCE;
                ns->ln_flags &= ~LF_UPGRADE;
-               cfs_list_del_init(&com->lc_link);
-               cfs_list_del_init(&com->lc_link_dir);
-               cfs_list_add_tail(&com->lc_link, &lfsck->li_list_double_scan);
+               list_del_init(&com->lc_link_dir);
+               list_move_tail(&com->lc_link, &lfsck->li_list_double_scan);
        } else if (result == 0) {
                ns->ln_status = lfsck->li_status;
                if (ns->ln_status == 0)
                        ns->ln_status = LS_STOPPED;
                if (ns->ln_status != LS_PAUSED) {
-                       cfs_list_del_init(&com->lc_link);
-                       cfs_list_del_init(&com->lc_link_dir);
-                       cfs_list_add_tail(&com->lc_link, &lfsck->li_list_idle);
+                       list_del_init(&com->lc_link_dir);
+                       list_move_tail(&com->lc_link, &lfsck->li_list_idle);
                }
        } else {
                ns->ln_status = LS_FAILED;
-               cfs_list_del_init(&com->lc_link);
-               cfs_list_del_init(&com->lc_link_dir);
-               cfs_list_add_tail(&com->lc_link, &lfsck->li_list_idle);
+               list_del_init(&com->lc_link_dir);
+               list_move_tail(&com->lc_link, &lfsck->li_list_idle);
        }
        spin_unlock(&lfsck->li_lock);
 
@@ -1702,8 +1698,8 @@ int lfsck_namespace_setup(const struct lu_env *env,
        if (com == NULL)
                RETURN(-ENOMEM);
 
-       CFS_INIT_LIST_HEAD(&com->lc_link);
-       CFS_INIT_LIST_HEAD(&com->lc_link_dir);
+       INIT_LIST_HEAD(&com->lc_link);
+       INIT_LIST_HEAD(&com->lc_link_dir);
        init_rwsem(&com->lc_sem);
        atomic_set(&com->lc_ref, 1);
        com->lc_lfsck = lfsck;
@@ -1752,7 +1748,7 @@ int lfsck_namespace_setup(const struct lu_env *env,
        case LS_FAILED:
        case LS_STOPPED:
                spin_lock(&lfsck->li_lock);
-               cfs_list_add_tail(&com->lc_link, &lfsck->li_list_idle);
+               list_add_tail(&com->lc_link, &lfsck->li_list_idle);
                spin_unlock(&lfsck->li_lock);
                break;
        default:
@@ -1769,8 +1765,8 @@ int lfsck_namespace_setup(const struct lu_env *env,
        case LS_PAUSED:
        case LS_CRASHED:
                spin_lock(&lfsck->li_lock);
-               cfs_list_add_tail(&com->lc_link, &lfsck->li_list_scan);
-               cfs_list_add_tail(&com->lc_link_dir, &lfsck->li_list_dir);
+               list_add_tail(&com->lc_link, &lfsck->li_list_scan);
+               list_add_tail(&com->lc_link_dir, &lfsck->li_list_dir);
                spin_unlock(&lfsck->li_lock);
                break;
        }