diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2017-09-29 15:43:51 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-10-30 12:28:00 +0100 |
| commit | 7c777430e855898461d54efd14b3942c763ee8de (patch) | |
| tree | 3304f759e0451561b124f8f52c930b9513fa95dd /fs/btrfs | |
| parent | fd708b81d972a0714b02a60eb4792fdbf15868c4 (diff) | |
| download | linux-7c777430e855898461d54efd14b3942c763ee8de.tar.bz2 | |
Btrfs: only check delayed ref usage in should_end_transaction
We were only doing btrfs_check_space_for_delayed_refs() if the metadata
space was full, ie we couldn't allocate chunks. This assumes we'll be
able to allocate chunks during transaction commit, but since nothing
does a LIMIT flush during the transaction commit this won't actually
happen unless we happen to run shy of actual space. We already take
into account a full fs in btrfs_check_space_for_delayed_refs() so just
kill this extra check to make sure we're ending the transaction when we
need to.
Signed-off-by: Josef Bacik <jbacik@fb.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/transaction.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 9c5f126064bd..68c3e1c04bca 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -797,8 +797,7 @@ static int should_end_transaction(struct btrfs_trans_handle *trans) { struct btrfs_fs_info *fs_info = trans->fs_info; - if (fs_info->global_block_rsv.space_info->full && - btrfs_check_space_for_delayed_refs(trans, fs_info)) + if (btrfs_check_space_for_delayed_refs(trans, fs_info)) return 1; return !!btrfs_block_rsv_check(&fs_info->global_block_rsv, 5); |