btrfs: switch more printks to our helpers

Convert the simple cases, not all functions provide a way to reach the
fs_info. Also skipped debugging messages (print-tree, integrity
checker and pr_debug) and messages that are printed from possibly
unfinished mount.

Signed-off-by: David Sterba <dsterba@suse.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 72553cd9ed14..5bc94d2d5699 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2347,8 +2347,7 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,
         u64 bytenr = btrfs_super_log_root(disk_super);
 
         if (fs_devices->rw_devices == 0) {
-                printk(KERN_WARNING "BTRFS: log replay required "
-                       "on RO media\n");
+                btrfs_warn(fs_info, "log replay required on RO media");
                 return -EIO;
         }
 
@@ -2363,12 +2362,12 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,
         log_tree_root->node = read_tree_block(tree_root, bytenr,
                         fs_info->generation + 1);
         if (IS_ERR(log_tree_root->node)) {
-                printk(KERN_ERR "BTRFS: failed to read log tree\n");
+                btrfs_warn(fs_info, "failed to read log tree");
                 ret = PTR_ERR(log_tree_root->node);
                 kfree(log_tree_root);
                 return ret;
         } else if (!extent_buffer_uptodate(log_tree_root->node)) {
-                printk(KERN_ERR "BTRFS: failed to read log tree\n");
+                btrfs_err(fs_info, "failed to read log tree");
                 free_extent_buffer(log_tree_root->node);
                 kfree(log_tree_root);
                 return -EIO;
@@ -3294,8 +3293,9 @@ static int write_dev_supers(struct btrfs_device *device,
                         bh = __getblk(device->bdev, bytenr / 4096,
                                       BTRFS_SUPER_INFO_SIZE);
                         if (!bh) {
-                                printk(KERN_ERR "BTRFS: couldn't get super "
-                                       "buffer head for bytenr %Lu\n", bytenr);
+                                btrfs_err(device->dev_root->fs_info,
+                                    "couldn't get super buffer head for bytenr %llu",
+                                    bytenr);
                                 errors++;
                                 continue;
                         }