btrfs: use list_for_each_entry_safe in free-space-cache.c

[cascardo/linux.git] / fs / btrfs / free-space-cache.c

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index 1b2ff8b..e5d7ec8 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -1086,14 +1086,11 @@ write_pinned_extent_entries(struct btrfs_root *root,
 static noinline_for_stack int
 write_bitmap_entries(struct btrfs_io_ctl *io_ctl, struct list_head *bitmap_list)
 {
-       struct list_head *pos, *n;
+       struct btrfs_free_space *entry, *next;
        int ret;
 
        /* Write out the bitmaps */
-       list_for_each_safe(pos, n, bitmap_list) {
-               struct btrfs_free_space *entry =
-                       list_entry(pos, struct btrfs_free_space, list);
-
+       list_for_each_entry_safe(entry, next, bitmap_list, list) {
                ret = io_ctl_add_bitmap(io_ctl, entry->bitmap);
                if (ret)
                        return -ENOSPC;
@@ -1119,13 +1116,10 @@ static int flush_dirty_cache(struct inode *inode)
 static void noinline_for_stack
 cleanup_bitmap_list(struct list_head *bitmap_list)
 {
-       struct list_head *pos, *n;
+       struct btrfs_free_space *entry, *next;
 
-       list_for_each_safe(pos, n, bitmap_list) {
-               struct btrfs_free_space *entry =
-                       list_entry(pos, struct btrfs_free_space, list);
+       list_for_each_entry_safe(entry, next, bitmap_list, list)
                list_del_init(&entry->list);
-       }
 }
 
 static void noinline_for_stack