Commit f87b7eb8 authored by David Sterba's avatar David Sterba

btrfs: get fs_info from block group in next_block_group

We can read fs_info from the block group cache structure and can drop it
from the parameters.
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 32b593bf
...@@ -3256,10 +3256,10 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans, ...@@ -3256,10 +3256,10 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans,
} }
static struct btrfs_block_group_cache * static struct btrfs_block_group_cache *next_block_group(
next_block_group(struct btrfs_fs_info *fs_info, struct btrfs_block_group_cache *cache)
struct btrfs_block_group_cache *cache)
{ {
struct btrfs_fs_info *fs_info = cache->fs_info;
struct rb_node *node; struct rb_node *node;
spin_lock(&fs_info->block_group_cache_lock); spin_lock(&fs_info->block_group_cache_lock);
...@@ -10050,7 +10050,7 @@ void btrfs_put_block_group_cache(struct btrfs_fs_info *info) ...@@ -10050,7 +10050,7 @@ void btrfs_put_block_group_cache(struct btrfs_fs_info *info)
if (block_group->iref) if (block_group->iref)
break; break;
spin_unlock(&block_group->lock); spin_unlock(&block_group->lock);
block_group = next_block_group(info, block_group); block_group = next_block_group(block_group);
} }
if (!block_group) { if (!block_group) {
if (last == 0) if (last == 0)
...@@ -11296,7 +11296,7 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range) ...@@ -11296,7 +11296,7 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range)
int ret = 0; int ret = 0;
cache = btrfs_lookup_first_block_group(fs_info, range->start); cache = btrfs_lookup_first_block_group(fs_info, range->start);
for (; cache; cache = next_block_group(fs_info, cache)) { for (; cache; cache = next_block_group(cache)) {
if (cache->key.objectid >= (range->start + range->len)) { if (cache->key.objectid >= (range->start + range->len)) {
btrfs_put_block_group(cache); btrfs_put_block_group(cache);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment