Re: [PATCH] btrfs: abort the transaction if we fail to replay log trees

[Qu Wenruo <quwenruo.btrfs@gmx.com>]

On 2021/5/19 下午11:29, Josef Bacik wrote:
> During inspection of the return path for replay I noticed that we don't
> actually abort the transaction if we get a failure during replay.  This
> isn't a problem necessarily, as we properly return the error and will
> fail to mount.  However we still leave this dangling transaction that
> could conceivably be committed without thinking there was an error.
> Handle this by making sure we abort the transaction on error to
> safeguard us from any problems in the future.
>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu

> ---
>   fs/btrfs/tree-log.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
> index 4dc74949040d..18009095908b 100644
> --- a/fs/btrfs/tree-log.c
> +++ b/fs/btrfs/tree-log.c
> @@ -6352,8 +6352,10 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)
>
>   	return 0;
>   error:
> -	if (wc.trans)
> +	if (wc.trans) {
> +		btrfs_abort_transaction(wc.trans, ret);
>   		btrfs_end_transaction(wc.trans);
> +	}
>   	btrfs_free_path(path);
>   	return ret;
>   }
>