btrfs: don't call btrfs_handle_fs_error() in btrfs_commit_transaction()

There's no need to call btrfs_handle_fs_error() as we are inside a
transaction and if we get an error we jump to the 'scrub_continue' label
and end up calling cleanup_transaction(), which aborts the transaction.

This is odd given that we have a transaction handle and that in the
transaction commit path any error makes us abort the transaction and
it's the only place that calls btrfs_handle_fs_error().

Remove the btrfs_handle_fs_error() call and replace it with an error
message so that if it happens we know what went wrong during the
transaction commit. Also annotate the condition in the if statement
with 'unlikely' since this is not expected to happen.

We've been wanting to remove btrfs_handle_fs_error(), so this removes
one user that does not even needs it.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index a2a1c0aaeb759af0e862ae7152c9c0d0cc96c7f1..d29d32dff6e3124698ecdf9195de3dced8b51809 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -2550,9 +2550,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
                wake_up_process(fs_info->cleaner_kthread);
 
        ret = btrfs_write_and_wait_transaction(trans);
-       if (ret) {
-               btrfs_handle_fs_error(fs_info, ret,
-                                     "Error while writing out transaction");
+       if (unlikely(ret)) {
+               btrfs_err(fs_info, "error while writing out transaction: %d", ret);
                mutex_unlock(&fs_info->tree_log_mutex);
                goto scrub_continue;
        }