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

Pull btrfs updates from Chris Mason:
 "This is a big variety of fixes and cleanups.

  Liu Bo continues to fixup fuzzer related problems, and some of Josef's
  cleanups are prep for his bigger extent buffer changes (slated for
  v4.10)"

* 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (39 commits)
  Revert "btrfs: let btrfs_delete_unused_bgs() to clean relocated bgs"
  Btrfs: remove unnecessary btrfs_mark_buffer_dirty in split_leaf
  Btrfs: don't BUG() during drop snapshot
  btrfs: fix btrfs_no_printk stub helper
  Btrfs: memset to avoid stale content in btree leaf
  btrfs: parent_start initialization cleanup
  btrfs: Remove already completed TODO comment
  btrfs: Do not reassign count in btrfs_run_delayed_refs
  btrfs: fix a possible umount deadlock
  Btrfs: fix memory leak in do_walk_down
  btrfs: btrfs_debug should consume fs_info when DEBUG is not defined
  btrfs: convert send's verbose_printk to btrfs_debug
  btrfs: convert pr_* to btrfs_* where possible
  btrfs: convert printk(KERN_* to use pr_* calls
  btrfs: unsplit printed strings
  btrfs: clean the old superblocks before freeing the device
  Btrfs: kill BUG_ON in run_delayed_tree_ref
  Btrfs: don't leak reloc root nodes on error
  btrfs: squash lines for simple wrapper functions
  Btrfs: improve check_node to avoid reading corrupted nodes
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 8a84ebd8e7cc..528cae123dc9 100644
--- 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;