LU-6142 lustre: use list_first/last_entry() for list heads

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_scrub.c

diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c
index 3a125ab..81d25e0 100644 (file)
--- a/lustre/osd-ldiskfs/osd_scrub.c
+++ b/lustre/osd-ldiskfs/osd_scrub.c
@@ -827,8 +827,9 @@ static int osd_scrub_next(struct osd_thread_info *info, struct osd_device *dev,
                if (likely(!list_empty(&scrub->os_inconsistent_items))) {
                        struct osd_inconsistent_item *oii;
 
-                       oii = list_entry(scrub->os_inconsistent_items.next,
-                               struct osd_inconsistent_item, oii_list);
+                       oii = list_first_entry(&scrub->os_inconsistent_items,
+                                              struct osd_inconsistent_item,
+                                              oii_list);
 
                        *oic = &oii->oii_cache;
                        scrub->os_in_prior = 1;
@@ -2482,8 +2483,8 @@ static void osd_initial_OI_scrub(struct osd_thread_info *info,
                if (list_empty(&dev->od_ios_list))
                        break;
 
-               item = list_entry(dev->od_ios_list.next,
-                                 struct osd_ios_item, oii_list);
+               item = list_first_entry(&dev->od_ios_list,
+                                       struct osd_ios_item, oii_list);
                list_del_init(&item->oii_list);
 
                LASSERT(item->oii_scandir != NULL);
@@ -2527,9 +2528,9 @@ static void osd_initial_OI_scrub(struct osd_thread_info *info,
                while (!list_empty(&dev->od_index_restore_list)) {
                        struct lustre_index_restore_unit *liru;
 
-                       liru = list_entry(dev->od_index_restore_list.next,
-                                         struct lustre_index_restore_unit,
-                                         liru_link);
+                       liru = list_first_entry(&dev->od_index_restore_list,
+                                               struct lustre_index_restore_unit,
+                                               liru_link);
                        list_del(&liru->liru_link);
                        if (buf)
                                osd_index_restore(info->oti_env, dev, liru,