diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2020-01-29 12:00:33 -0500 |
|---|---|---|
| committer | Josef Bacik <josef@toxicpanda.com> | 2020-02-14 10:04:05 -0500 |
| commit | 108a91de31fe21dfce08823202c0362c03abc1b9 (patch) | |
| tree | eb66964acb5b0115f35b0d44f03c6542163a9b74 | |
| parent | ada6b7a3bbadcbf234a7fe5cd8a59d0709e635fa (diff) | |
| download | btrfs-next-108a91de31fe21dfce08823202c0362c03abc1b9.tar.gz | |
btrfs: make shrink_delalloc take space_info as an arg
Currently shrink_delalloc just looks up the metadata space info, but
this won't work if we're trying to reclaim space for data chunks. We
get the right space_info we want passed into flush_space, so simply pass
that along to shrink_delalloc.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Tested-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
| -rw-r--r-- | fs/btrfs/space-info.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c index 84743a4a5dd54d..a2222f4d650038 100644 --- a/fs/btrfs/space-info.c +++ b/fs/btrfs/space-info.c @@ -496,10 +496,10 @@ static inline u64 calc_reclaim_items_nr(struct btrfs_fs_info *fs_info, /* * shrink metadata reservation for delalloc */ -static void shrink_delalloc(struct btrfs_fs_info *fs_info, u64 to_reclaim, - bool wait_ordered) +static void shrink_delalloc(struct btrfs_fs_info *fs_info, + struct btrfs_space_info *space_info, + u64 to_reclaim, bool wait_ordered) { - struct btrfs_space_info *space_info; struct btrfs_trans_handle *trans; u64 delalloc_bytes; u64 dio_bytes; @@ -525,7 +525,6 @@ static void shrink_delalloc(struct btrfs_fs_info *fs_info, u64 to_reclaim, } trans = (struct btrfs_trans_handle *)current->journal_info; - space_info = btrfs_find_space_info(fs_info, BTRFS_BLOCK_GROUP_METADATA); delalloc_bytes = percpu_counter_sum_positive( &fs_info->delalloc_bytes); @@ -727,7 +726,7 @@ static void flush_space(struct btrfs_fs_info *fs_info, break; case FLUSH_DELALLOC: case FLUSH_DELALLOC_WAIT: - shrink_delalloc(fs_info, num_bytes, + shrink_delalloc(fs_info, space_info, num_bytes, state == FLUSH_DELALLOC_WAIT); break; case FLUSH_DELAYED_REFS_NR: |