Skip to content

Commit f6873a1

Browse files
chaseyupundiramit
authored andcommitted
f2fs: clean up with list_{first, last}_entry
commit 939afa943c5290a3b92f01612a792af17bc98115 upstream. Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 4874360 commit f6873a1

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

fs/f2fs/checkpoint.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ int sync_dirty_inodes(struct f2fs_sb_info *sbi, enum inode_type type)
892892
F2FS_DIRTY_DENTS : F2FS_DIRTY_DATA));
893893
return 0;
894894
}
895-
fi = list_entry(head->next, struct f2fs_inode_info, dirty_list);
895+
fi = list_first_entry(head, struct f2fs_inode_info, dirty_list);
896896
inode = igrab(&fi->vfs_inode);
897897
spin_unlock(&sbi->inode_lock[type]);
898898
if (inode) {
@@ -925,7 +925,7 @@ int f2fs_sync_inode_meta(struct f2fs_sb_info *sbi)
925925
spin_unlock(&sbi->inode_lock[DIRTY_META]);
926926
return 0;
927927
}
928-
fi = list_entry(head->next, struct f2fs_inode_info,
928+
fi = list_first_entry(head, struct f2fs_inode_info,
929929
gdirty_list);
930930
inode = igrab(&fi->vfs_inode);
931931
spin_unlock(&sbi->inode_lock[DIRTY_META]);

fs/f2fs/data.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ static int f2fs_mpage_readpages(struct address_space *mapping,
11441144

11451145
prefetchw(&page->flags);
11461146
if (pages) {
1147-
page = list_entry(pages->prev, struct page, lru);
1147+
page = list_last_entry(pages, struct page, lru);
11481148
list_del(&page->lru);
11491149
if (add_to_page_cache_lru(page, mapping,
11501150
page->index, GFP_KERNEL))
@@ -1262,7 +1262,7 @@ static int f2fs_read_data_pages(struct file *file,
12621262
struct list_head *pages, unsigned nr_pages)
12631263
{
12641264
struct inode *inode = file->f_mapping->host;
1265-
struct page *page = list_entry(pages->prev, struct page, lru);
1265+
struct page *page = list_last_entry(pages, struct page, lru);
12661266

12671267
trace_f2fs_readpages(inode, page, nr_pages);
12681268

fs/f2fs/node.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static inline void next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid)
174174
spin_unlock(&nm_i->nid_list_lock);
175175
return;
176176
}
177-
fnid = list_entry(nm_i->nid_list[FREE_NID_LIST].next,
177+
fnid = list_first_entry(&nm_i->nid_list[FREE_NID_LIST],
178178
struct free_nid, list);
179179
*nid = fnid->nid;
180180
spin_unlock(&nm_i->nid_list_lock);

0 commit comments

Comments
 (0)