Btrfs: simplify error handling of clean_pinned_extents()
PATCH 2/2 Btrfs: simplify error handling of clean_pinned_extents()
From: Filipe Manana <[email protected]>
At clean_pinned_extents(), whether we end up returning success or failure, we pretty much have to do the same things:
1) unlock unused_bg_unpin_mutex
2) decrement reference count on the previous transaction
We also call btrfs_dec_block_group_ro() in case of failure, but that is better done in its caller, btrfs_delete_unused_bgs(), since its the caller that calls inc_block_group_ro(), so it should be responsible for the decrement operation, as it is in case any of the other functions it calls fail.
So move the call to btrfs_dec_block_group_ro() from clean_pinned_extents() into btrfs_delete_unused_bgs() and unify the error and success return paths for clean_pinned_extents(), reducing duplicated code and making it simpler.
--- fs/btrfs/block-group.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
fs/btrfs/block-group.c +6 -12
@@ -1280,25 +1280,17 @@ static bool clean_pinned_extents(struct btrfs_trans_handle *trans, ret =clear_extent_bits (&prev_trans->pinned_extents, start, end,EXTENT_DIRTY );if (ret) - goto err; + goto out; } ret =clear_extent_bits (&trans->transaction->pinned_extents, start, end,EXTENT_DIRTY ); -if (ret) - goto err; +out:mutex_unlock (&fs_info->unused_bg_unpin_mutex);if (prev_trans)refcount_dec (&prev_trans->use_count); -return true; - -err: -mutex_unlock (&fs_info->unused_bg_unpin_mutex); -if (prev_trans) -refcount_dec (&prev_trans->use_count); -btrfs_dec_block_group_ro (bg); -return false; +return ret ==0 ; }/*
@@ -1396,8 +1388,10 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)* We could have pending pinned extents for this block group, * just delete them, we don't care about them anymore. */ -if (!clean_pinned_extents (trans, block_group)) +if (!clean_pinned_extents (trans, block_group)) { +btrfs_dec_block_group_ro (block_group); goto end_trans; + }/* * At this point, the block_group is read only and should fail
Signature · 1 line
2.11.0
Quoted 14 lines · On Fri, Apr 17, 2020 at 03:40:21PM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
At
clean_pinned_extents(), whether we end up returning success or failure, we pretty much have to do the same things:1) unlock
unused_bg_unpin_mutex
2) decrement reference count on the previous transactionWe also call
btrfs_dec_block_group_ro()in case of failure, but that is better done in its caller,btrfs_delete_unused_bgs(), since its the caller that callsinc_block_group_ro(), so it should be responsible for the decrement operation, as it is in case any of the other functions it calls fail.
Quoted 6 lines
So move the call to
btrfs_dec_block_group_ro()fromclean_pinned_extents()intobtrfs_delete_unused_bgs()and unify the error and success return paths forclean_pinned_extents(), reducing duplicated code and making it simpler.Signed-off-by Filipe Manana <[email protected]>
Added to misc-next, thanks.
Quoted 14 lines · On 17.04.20 г. 17:40 ч., [email protected] wrote:
From: Filipe Manana <[email protected]>
At
clean_pinned_extents(), whether we end up returning success or failure, we pretty much have to do the same things:1) unlock
unused_bg_unpin_mutex
2) decrement reference count on the previous transactionWe also call
btrfs_dec_block_group_ro()in case of failure, but that is better done in its caller,btrfs_delete_unused_bgs(), since its the caller that callsinc_block_group_ro(), so it should be responsible for the decrement operation, as it is in case any of the other functions it calls fail.
Quoted 6 lines
So move the call to
btrfs_dec_block_group_ro()fromclean_pinned_extents()intobtrfs_delete_unused_bgs()and unify the error and success return paths forclean_pinned_extents(), reducing duplicated code and making it simpler.Signed-off-by Filipe Manana <[email protected]>
PATCH v2 2/2 Btrfs: simplify error handling of clean_pinned_extents()
In reply to [email protected]From: Filipe Manana <[email protected]>
At clean_pinned_extents(), whether we end up returning success or failure, we pretty much have to do the same things:
1) unlock unused_bg_unpin_mutex
2) decrement reference count on the previous transaction
We also call btrfs_dec_block_group_ro() in case of failure, but that is better done in its caller, btrfs_delete_unused_bgs(), since its the caller that calls inc_block_group_ro(), so it should be responsible for the decrement operation, as it is in case any of the other functions it calls fail.
So move the call to btrfs_dec_block_group_ro() from clean_pinned_extents() into btrfs_delete_unused_bgs() and unify the error and success return paths for clean_pinned_extents(), reducing duplicated code and making it simpler.
---
V2: Updated version after patch 1 in the series changed.
fs/btrfs/block-group.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
fs/btrfs/block-group.c +6 -12
@@ -1280,25 +1280,17 @@ static bool clean_pinned_extents(struct btrfs_trans_handle *trans, ret =clear_extent_bits (&prev_trans->pinned_extents, start, end,EXTENT_DIRTY );if (ret) - goto err; + goto out; } ret =clear_extent_bits (&trans->transaction->pinned_extents, start, end,EXTENT_DIRTY ); -if (ret) - goto err; +out:mutex_unlock (&fs_info->unused_bg_unpin_mutex);if (prev_trans)btrfs_put_transaction (prev_trans); -return true; - -err: -mutex_unlock (&fs_info->unused_bg_unpin_mutex); -if (prev_trans) -btrfs_put_transaction (prev_trans); -btrfs_dec_block_group_ro (bg); -return false; +return ret ==0 ; }/*
@@ -1396,8 +1388,10 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)* We could have pending pinned extents for this block group, * just delete them, we don't care about them anymore. */ -if (!clean_pinned_extents (trans, block_group)) +if (!clean_pinned_extents (trans, block_group)) { +btrfs_dec_block_group_ro (block_group); goto end_trans; + }/* * At this point, the block_group is read only and should fail
Signature · 1 line
2.11.0