|
@@ -1086,14 +1086,11 @@ write_pinned_extent_entries(struct btrfs_root *root,
|
|
static noinline_for_stack int
|
|
static noinline_for_stack int
|
|
write_bitmap_entries(struct btrfs_io_ctl *io_ctl, struct list_head *bitmap_list)
|
|
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;
|
|
int ret;
|
|
|
|
|
|
/* Write out the bitmaps */
|
|
/* 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);
|
|
ret = io_ctl_add_bitmap(io_ctl, entry->bitmap);
|
|
if (ret)
|
|
if (ret)
|
|
return -ENOSPC;
|
|
return -ENOSPC;
|
|
@@ -1119,13 +1116,10 @@ static int flush_dirty_cache(struct inode *inode)
|
|
static void noinline_for_stack
|
|
static void noinline_for_stack
|
|
cleanup_bitmap_list(struct list_head *bitmap_list)
|
|
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);
|
|
list_del_init(&entry->list);
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
static void noinline_for_stack
|
|
static void noinline_for_stack
|