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>
This commit is contained in:
parent
556f5ba349
commit
7129702a48
3 changed files with 5 additions and 5 deletions
|
@ -892,7 +892,7 @@ retry:
|
|||
F2FS_DIRTY_DENTS : F2FS_DIRTY_DATA));
|
||||
return 0;
|
||||
}
|
||||
fi = list_entry(head->next, struct f2fs_inode_info, dirty_list);
|
||||
fi = list_first_entry(head, struct f2fs_inode_info, dirty_list);
|
||||
inode = igrab(&fi->vfs_inode);
|
||||
spin_unlock(&sbi->inode_lock[type]);
|
||||
if (inode) {
|
||||
|
@ -925,7 +925,7 @@ int f2fs_sync_inode_meta(struct f2fs_sb_info *sbi)
|
|||
spin_unlock(&sbi->inode_lock[DIRTY_META]);
|
||||
return 0;
|
||||
}
|
||||
fi = list_entry(head->next, struct f2fs_inode_info,
|
||||
fi = list_first_entry(head, struct f2fs_inode_info,
|
||||
gdirty_list);
|
||||
inode = igrab(&fi->vfs_inode);
|
||||
spin_unlock(&sbi->inode_lock[DIRTY_META]);
|
||||
|
|
|
@ -1144,7 +1144,7 @@ static int f2fs_mpage_readpages(struct address_space *mapping,
|
|||
|
||||
prefetchw(&page->flags);
|
||||
if (pages) {
|
||||
page = list_entry(pages->prev, struct page, lru);
|
||||
page = list_last_entry(pages, struct page, lru);
|
||||
list_del(&page->lru);
|
||||
if (add_to_page_cache_lru(page, mapping,
|
||||
page->index, GFP_KERNEL))
|
||||
|
@ -1262,7 +1262,7 @@ static int f2fs_read_data_pages(struct file *file,
|
|||
struct list_head *pages, unsigned nr_pages)
|
||||
{
|
||||
struct inode *inode = file->f_mapping->host;
|
||||
struct page *page = list_entry(pages->prev, struct page, lru);
|
||||
struct page *page = list_last_entry(pages, struct page, lru);
|
||||
|
||||
trace_f2fs_readpages(inode, page, nr_pages);
|
||||
|
||||
|
|
|
@ -174,7 +174,7 @@ static inline void next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid)
|
|||
spin_unlock(&nm_i->nid_list_lock);
|
||||
return;
|
||||
}
|
||||
fnid = list_entry(nm_i->nid_list[FREE_NID_LIST].next,
|
||||
fnid = list_first_entry(&nm_i->nid_list[FREE_NID_LIST],
|
||||
struct free_nid, list);
|
||||
*nid = fnid->nid;
|
||||
spin_unlock(&nm_i->nid_list_lock);
|
||||
|
|
Loading…
Add table
Reference in a new issue