diff --git a/kmod/src/item.c b/kmod/src/item.c index 8c7900d5..948fcd70 100644 --- a/kmod/src/item.c +++ b/kmod/src/item.c @@ -2277,7 +2277,7 @@ int scoutfs_item_write_dirty(struct super_block *sb) ret = -ENOMEM; goto out; } - list_add(&page->list, &pages); + list_add(&page->lru, &pages); first = NULL; prev = &first; @@ -2290,7 +2290,7 @@ int scoutfs_item_write_dirty(struct super_block *sb) ret = -ENOMEM; goto out; } - list_add(&second->list, &pages); + list_add(&second->lru, &pages); } /* read lock next sorted page, we're only dirty_list user */ @@ -2347,8 +2347,8 @@ int scoutfs_item_write_dirty(struct super_block *sb) /* write all the dirty items into log btree blocks */ ret = scoutfs_forest_insert_list(sb, first); out: - list_for_each_entry_safe(page, second, &pages, list) { - list_del_init(&page->list); + list_for_each_entry_safe(page, second, &pages, lru) { + list_del_init(&page->lru); __free_page(page); } diff --git a/kmod/src/srch.c b/kmod/src/srch.c index ebf113e6..36385ad9 100644 --- a/kmod/src/srch.c +++ b/kmod/src/srch.c @@ -1747,7 +1747,7 @@ static int compact_logs(struct super_block *sb, goto out; } page->private = 0; - list_add_tail(&page->list, &pages); + list_add_tail(&page->lru, &pages); nr_pages++; scoutfs_inc_counter(sb, srch_compact_log_page); } @@ -1800,7 +1800,7 @@ static int compact_logs(struct super_block *sb, /* sort page entries and reset private for _next */ i = 0; - list_for_each_entry(page, &pages, list) { + list_for_each_entry(page, &pages, lru) { args[i++] = page; if (atomic_read(&srinf->shutdown)) { @@ -1821,7 +1821,7 @@ static int compact_logs(struct super_block *sb, goto out; /* make sure we finished all the pages */ - list_for_each_entry(page, &pages, list) { + list_for_each_entry(page, &pages, lru) { sre = page_priv_sre(page); if (page->private < SRES_PER_PAGE && sre->ino != 0) { ret = -ENOSPC; @@ -1834,8 +1834,8 @@ static int compact_logs(struct super_block *sb, out: scoutfs_block_put(sb, bl); vfree(args); - list_for_each_entry_safe(page, tmp, &pages, list) { - list_del(&page->list); + list_for_each_entry_safe(page, tmp, &pages, lru) { + list_del(&page->lru); __free_page(page); }