Re: [PATCH] btrfs/volumes: Improve unlocking of a mutex in __btrfs_balance()

From: David Sterba
Date: Mon Nov 06 2017 - 09:26:49 EST


On Mon, Nov 06, 2017 at 09:04:37AM +0100, SF Markus Elfring wrote:
>
> * Adjust jump targets so that a call of the function "mutex_unlock"
> can be better reused for error cases at the end of this function.
>
> * Replace three calls by goto statements.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
> ---
> @@ -3682,7 +3678,7 @@ static int __btrfs_balance(struct btrfs_fs_info *fs_info)
> counting = false;
> goto again;
> }
> -error:
> +free_path:
> btrfs_free_path(path);
> if (enospc_errors) {
> btrfs_info(fs_info, "%d enospc errors during balance",
> @@ -3692,6 +3688,10 @@ static int __btrfs_balance(struct btrfs_fs_info *fs_info)
> }
>
> return ret;
> +
> +unlock:
> + mutex_unlock(&fs_info->delete_unused_bgs_mutex);
> + goto free_path;
> }

This is also an anti-pattern, the label followed by a goto jumping back
to the exit/cleanup block, right at the end of a function. I've sent
some patches in the past to clean that up and don't want to reintroduce
it.