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>

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index fbf04d4d79640ae426f599c41d54904dca5b3959..45ef3b6bfb04f696fb22f9bdf6f821fc431bd390 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -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]);

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 6c8465d26bb1de251fb91b6d6b01abb4f777ae30..f1001c871cb6575f4c49a7b97bc58cc5e1eeddce 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -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);
 

diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index e7997e2403660799de6ed30605f5b090e938fd5f..9278b21ee07381f5972d7b9a65814db25c7c8067 100644 (file)
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -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);