diff options
author | Frank Holton <fholton@gmail.com> | 2013-12-20 11:37:06 -0500 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2014-01-28 16:20:05 -0500 |
commit | efe120a067c8674a8ae21b194f0e68f098b61ee2 (patch) | |
tree | 1edb3b59b689a96ec15b548387c048ee959fb6fd /fs/btrfs/ctree.c | |
parent | 5de865eebb8330eee19c37b31fb6f315a09d4273 (diff) |
Btrfs: convert printk to btrfs_ and fix BTRFS prefix
Convert all applicable cases of printk and pr_* to the btrfs_* macros.
Fix all uses of the BTRFS prefix.
Signed-off-by: Frank Holton <fholton@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/ctree.c')
-rw-r--r-- | fs/btrfs/ctree.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 7d88d8543aa1..062438d38985 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c | |||
@@ -1480,8 +1480,8 @@ get_old_root(struct btrfs_root *root, u64 time_seq) | |||
1480 | old = read_tree_block(root, logical, blocksize, 0); | 1480 | old = read_tree_block(root, logical, blocksize, 0); |
1481 | if (WARN_ON(!old || !extent_buffer_uptodate(old))) { | 1481 | if (WARN_ON(!old || !extent_buffer_uptodate(old))) { |
1482 | free_extent_buffer(old); | 1482 | free_extent_buffer(old); |
1483 | pr_warn("btrfs: failed to read tree block %llu from get_old_root\n", | 1483 | btrfs_warn(root->fs_info, |
1484 | logical); | 1484 | "failed to read tree block %llu from get_old_root", logical); |
1485 | } else { | 1485 | } else { |
1486 | eb = btrfs_clone_extent_buffer(old); | 1486 | eb = btrfs_clone_extent_buffer(old); |
1487 | free_extent_buffer(old); | 1487 | free_extent_buffer(old); |
@@ -3611,8 +3611,8 @@ noinline int btrfs_leaf_free_space(struct btrfs_root *root, | |||
3611 | int ret; | 3611 | int ret; |
3612 | ret = BTRFS_LEAF_DATA_SIZE(root) - leaf_space_used(leaf, 0, nritems); | 3612 | ret = BTRFS_LEAF_DATA_SIZE(root) - leaf_space_used(leaf, 0, nritems); |
3613 | if (ret < 0) { | 3613 | if (ret < 0) { |
3614 | printk(KERN_CRIT "leaf free space ret %d, leaf data size %lu, " | 3614 | btrfs_crit(root->fs_info, |
3615 | "used %d nritems %d\n", | 3615 | "leaf free space ret %d, leaf data size %lu, used %d nritems %d", |
3616 | ret, (unsigned long) BTRFS_LEAF_DATA_SIZE(root), | 3616 | ret, (unsigned long) BTRFS_LEAF_DATA_SIZE(root), |
3617 | leaf_space_used(leaf, 0, nritems), nritems); | 3617 | leaf_space_used(leaf, 0, nritems), nritems); |
3618 | } | 3618 | } |
@@ -4702,7 +4702,7 @@ void btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path, | |||
4702 | BUG_ON(slot < 0); | 4702 | BUG_ON(slot < 0); |
4703 | if (slot >= nritems) { | 4703 | if (slot >= nritems) { |
4704 | btrfs_print_leaf(root, leaf); | 4704 | btrfs_print_leaf(root, leaf); |
4705 | printk(KERN_CRIT "slot %d too large, nritems %d\n", | 4705 | btrfs_crit(root->fs_info, "slot %d too large, nritems %d", |
4706 | slot, nritems); | 4706 | slot, nritems); |
4707 | BUG_ON(1); | 4707 | BUG_ON(1); |
4708 | } | 4708 | } |
@@ -4765,7 +4765,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path, | |||
4765 | 4765 | ||
4766 | if (btrfs_leaf_free_space(root, leaf) < total_size) { | 4766 | if (btrfs_leaf_free_space(root, leaf) < total_size) { |
4767 | btrfs_print_leaf(root, leaf); | 4767 | btrfs_print_leaf(root, leaf); |
4768 | printk(KERN_CRIT "not enough freespace need %u have %d\n", | 4768 | btrfs_crit(root->fs_info, "not enough freespace need %u have %d", |
4769 | total_size, btrfs_leaf_free_space(root, leaf)); | 4769 | total_size, btrfs_leaf_free_space(root, leaf)); |
4770 | BUG(); | 4770 | BUG(); |
4771 | } | 4771 | } |
@@ -4775,7 +4775,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path, | |||
4775 | 4775 | ||
4776 | if (old_data < data_end) { | 4776 | if (old_data < data_end) { |
4777 | btrfs_print_leaf(root, leaf); | 4777 | btrfs_print_leaf(root, leaf); |
4778 | printk(KERN_CRIT "slot %d old_data %d data_end %d\n", | 4778 | btrfs_crit(root->fs_info, "slot %d old_data %d data_end %d", |
4779 | slot, old_data, data_end); | 4779 | slot, old_data, data_end); |
4780 | BUG_ON(1); | 4780 | BUG_ON(1); |
4781 | } | 4781 | } |
@@ -5510,7 +5510,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root, | |||
5510 | 5510 | ||
5511 | if (!left_start_ctransid || !right_start_ctransid) { | 5511 | if (!left_start_ctransid || !right_start_ctransid) { |
5512 | WARN(1, KERN_WARNING | 5512 | WARN(1, KERN_WARNING |
5513 | "btrfs: btrfs_compare_tree detected " | 5513 | "BTRFS: btrfs_compare_tree detected " |
5514 | "a change in one of the trees while " | 5514 | "a change in one of the trees while " |
5515 | "iterating. This is probably a " | 5515 | "iterating. This is probably a " |
5516 | "bug.\n"); | 5516 | "bug.\n"); |