diff options
| author | Qu Wenruo <quwenruo@cn.fujitsu.com> | 2017-02-27 08:10:35 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-06-29 20:17:02 +0200 |
| commit | d1b8b94a2b4f416b416bdfde46315e9aef17f358 (patch) | |
| tree | 271e0e92eea260df6b2cb01f45eba3895419b898 /fs/btrfs/transaction.c | |
| parent | btrfs: qgroup: Add quick exit for non-fs extents (diff) | |
| download | linux-d1b8b94a2b4f416b416bdfde46315e9aef17f358.tar.xz linux-d1b8b94a2b4f416b416bdfde46315e9aef17f358.zip | |
btrfs: qgroup: Cleanup btrfs_qgroup_prepare_account_extents function
Quite a lot of qgroup corruption happens due to wrong time of calling
btrfs_qgroup_prepare_account_extents().
Since the safest time is to call it just before
btrfs_qgroup_account_extents(), there is no need to separate these 2
functions.
Merging them will make code cleaner and less bug prone.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
[ changelog and comment adjustments ]
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 97e33513b195..309b73da756b 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1374,9 +1374,6 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans, ret = commit_fs_roots(trans, fs_info); if (ret) goto out; - ret = btrfs_qgroup_prepare_account_extents(trans, fs_info); - if (ret < 0) - goto out; ret = btrfs_qgroup_account_extents(trans, fs_info); if (ret < 0) goto out; @@ -2180,13 +2177,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) goto scrub_continue; } - ret = btrfs_qgroup_prepare_account_extents(trans, fs_info); - if (ret) { - mutex_unlock(&fs_info->tree_log_mutex); - mutex_unlock(&fs_info->reloc_mutex); - goto scrub_continue; - } - /* * Since fs roots are all committed, we can get a quite accurate * new_roots. So let's do quota accounting. |