btrfs: change handle_fs_error in recover_log_trees to aborts

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.

We were using btrfs_handle_fs_error() here, but that pre-dates the
transaction abort code.  Simply replace the btrfs_handle_fs_error()
calls with transaction aborts, so we still know where exactly things
went wrong, and add a few in some other un-handled error cases.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 641e2b5a3b6494f3a98171c03fab062f7a9996c6..9bfadce594332ab8b70d7b3f917cdac48fe31ed2 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -6548,8 +6548,7 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)
 
        ret = walk_log_tree(trans, log_root_tree, &wc);
        if (ret) {
-               btrfs_handle_fs_error(fs_info, ret,
-                       "Failed to pin buffers while recovering log root tree.");
+               btrfs_abort_transaction(trans, ret);
                goto error;
        }
 
@@ -6562,8 +6561,7 @@ again:
                ret = btrfs_search_slot(NULL, log_root_tree, &key, path, 0, 0);
 
                if (ret < 0) {
-                       btrfs_handle_fs_error(fs_info, ret,
-                                   "Couldn't find tree log root.");
+                       btrfs_abort_transaction(trans, ret);
                        goto error;
                }
                if (ret > 0) {
@@ -6580,8 +6578,7 @@ again:
                log = btrfs_read_tree_root(log_root_tree, &found_key);
                if (IS_ERR(log)) {
                        ret = PTR_ERR(log);
-                       btrfs_handle_fs_error(fs_info, ret,
-                                   "Couldn't read tree log root.");
+                       btrfs_abort_transaction(trans, ret);
                        goto error;
                }
 
@@ -6609,8 +6606,7 @@ again:
 
                        if (!ret)
                                goto next;
-                       btrfs_handle_fs_error(fs_info, ret,
-                               "Couldn't read target root for tree log recovery.");
+                       btrfs_abort_transaction(trans, ret);
                        goto error;
                }
 
@@ -6618,14 +6614,15 @@ again:
                ret = btrfs_record_root_in_trans(trans, wc.replay_dest);
                if (ret)
                        /* The loop needs to continue due to the root refs */
-                       btrfs_handle_fs_error(fs_info, ret,
-                               "failed to record the log root in transaction");
+                       btrfs_abort_transaction(trans, ret);
                else
                        ret = walk_log_tree(trans, log, &wc);
 
                if (!ret && wc.stage == LOG_WALK_REPLAY_ALL) {
                        ret = fixup_inode_link_counts(trans, wc.replay_dest,
                                                      path);
+                       if (ret)
+                               btrfs_abort_transaction(trans, ret);
                }
 
                if (!ret && wc.stage == LOG_WALK_REPLAY_ALL) {
@@ -6642,6 +6639,8 @@ again:
                         * could only happen during mount.
                         */
                        ret = btrfs_init_root_free_objectid(root);
+                       if (ret)
+                               btrfs_abort_transaction(trans, ret);
                }
 
                wc.replay_dest->log_root = NULL;