Merge branch 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[cascardo/linux.git] / fs / btrfs / tree-log.c

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 8a84ebd..528cae1 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -5579,7 +5579,7 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)
        if (!path)
                return -ENOMEM;
 
-       fs_info->log_root_recovering = 1;
+       set_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags);
 
        trans = btrfs_start_transaction(fs_info->tree_root, 0);
        if (IS_ERR(trans)) {
@@ -5592,8 +5592,8 @@ 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_handle_fs_error(fs_info, ret,
+                       "Failed to pin buffers while recovering log root tree.");
                goto error;
        }
 
@@ -5639,8 +5639,8 @@ again:
                        free_extent_buffer(log->node);
                        free_extent_buffer(log->commit_root);
                        kfree(log);
-                       btrfs_handle_fs_error(fs_info, ret, "Couldn't read target root "
-                                   "for tree log recovery.");
+                       btrfs_handle_fs_error(fs_info, ret,
+                               "Couldn't read target root for tree log recovery.");
                        goto error;
                }
 
@@ -5689,7 +5689,7 @@ again:
 
        free_extent_buffer(log_root_tree->node);
        log_root_tree->log_root = NULL;
-       fs_info->log_root_recovering = 0;
+       clear_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags);
        kfree(log_root_tree);
 
        return 0;