mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2025-12-23 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use page->lru instead of page->list

Browse Source 
With v3.14-rc1-10-g34bf6ef94a83, page->list is removed Instead,
use the union member ->lru.

Signed-off-by: Auke Kok <auke.kok@versity.com>
This commit is contained in:
Auke Kok
2023-05-30 14:10:14 -04:00
parent 28f03d3558
commit 1d150da3f0
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kmod/src/item.c
View File

@@ -2277,7 +2277,7 @@ int scoutfs_item_write_dirty(struct super_block *sb)
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
list_add(&page->list, &pages); list_add(&page->lru, &pages);
first = NULL; first = NULL;
prev = &first; prev = &first;
@@ -2290,7 +2290,7 @@ int scoutfs_item_write_dirty(struct super_block *sb)
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
list_add(&second->list, &pages); list_add(&second->lru, &pages);
} }
/* read lock next sorted page, we're only dirty_list user */ /* 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 */ /* write all the dirty items into log btree blocks */
ret = scoutfs_forest_insert_list(sb, first); ret = scoutfs_forest_insert_list(sb, first);
out: out:
list_for_each_entry_safe(page, second, &pages, list) { list_for_each_entry_safe(page, second, &pages, lru) {
list_del_init(&page->list); list_del_init(&page->lru);
__free_page(page); __free_page(page);
} }

10
kmod/src/srch.c
View File

@@ -1747,7 +1747,7 @@ static int compact_logs(struct super_block *sb,
goto out; goto out;
} }
page->private = 0; page->private = 0;
list_add_tail(&page->list, &pages); list_add_tail(&page->lru, &pages);
nr_pages++; nr_pages++;
scoutfs_inc_counter(sb, srch_compact_log_page); 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 */ /* sort page entries and reset private for _next */
i = 0; i = 0;
list_for_each_entry(page, &pages, list) { list_for_each_entry(page, &pages, lru) {
args[i++] = page; args[i++] = page;
if (atomic_read(&srinf->shutdown)) { if (atomic_read(&srinf->shutdown)) {
@@ -1821,7 +1821,7 @@ static int compact_logs(struct super_block *sb,
goto out; goto out;
/* make sure we finished all the pages */ /* 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); sre = page_priv_sre(page);
if (page->private < SRES_PER_PAGE && sre->ino != 0) { if (page->private < SRES_PER_PAGE && sre->ino != 0) {
ret = -ENOSPC; ret = -ENOSPC;
@@ -1834,8 +1834,8 @@ static int compact_logs(struct super_block *sb,
out: out:
scoutfs_block_put(sb, bl); scoutfs_block_put(sb, bl);
vfree(args); vfree(args);
list_for_each_entry_safe(page, tmp, &pages, list) { list_for_each_entry_safe(page, tmp, &pages, lru) {
list_del(&page->list); list_del(&page->lru);
__free_page(page); __free_page(page);
} }