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/extent-tree.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/extent-tree.c')
-rw-r--r-- | fs/btrfs/extent-tree.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 9e524b0a7b3c..1c82bead2c08 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -6637,12 +6637,12 @@ static void dump_space_info(struct btrfs_space_info *info, u64 bytes, | |||
6637 | int index = 0; | 6637 | int index = 0; |
6638 | 6638 | ||
6639 | spin_lock(&info->lock); | 6639 | spin_lock(&info->lock); |
6640 | printk(KERN_INFO "space_info %llu has %llu free, is %sfull\n", | 6640 | printk(KERN_INFO "BTRFS: space_info %llu has %llu free, is %sfull\n", |
6641 | info->flags, | 6641 | info->flags, |
6642 | info->total_bytes - info->bytes_used - info->bytes_pinned - | 6642 | info->total_bytes - info->bytes_used - info->bytes_pinned - |
6643 | info->bytes_reserved - info->bytes_readonly, | 6643 | info->bytes_reserved - info->bytes_readonly, |
6644 | (info->full) ? "" : "not "); | 6644 | (info->full) ? "" : "not "); |
6645 | printk(KERN_INFO "space_info total=%llu, used=%llu, pinned=%llu, " | 6645 | printk(KERN_INFO "BTRFS: space_info total=%llu, used=%llu, pinned=%llu, " |
6646 | "reserved=%llu, may_use=%llu, readonly=%llu\n", | 6646 | "reserved=%llu, may_use=%llu, readonly=%llu\n", |
6647 | info->total_bytes, info->bytes_used, info->bytes_pinned, | 6647 | info->total_bytes, info->bytes_used, info->bytes_pinned, |
6648 | info->bytes_reserved, info->bytes_may_use, | 6648 | info->bytes_reserved, info->bytes_may_use, |
@@ -6656,7 +6656,9 @@ static void dump_space_info(struct btrfs_space_info *info, u64 bytes, | |||
6656 | again: | 6656 | again: |
6657 | list_for_each_entry(cache, &info->block_groups[index], list) { | 6657 | list_for_each_entry(cache, &info->block_groups[index], list) { |
6658 | spin_lock(&cache->lock); | 6658 | spin_lock(&cache->lock); |
6659 | printk(KERN_INFO "block group %llu has %llu bytes, %llu used %llu pinned %llu reserved %s\n", | 6659 | printk(KERN_INFO "BTRFS: " |
6660 | "block group %llu has %llu bytes, " | ||
6661 | "%llu used %llu pinned %llu reserved %s\n", | ||
6660 | cache->key.objectid, cache->key.offset, | 6662 | cache->key.objectid, cache->key.offset, |
6661 | btrfs_block_group_used(&cache->item), cache->pinned, | 6663 | btrfs_block_group_used(&cache->item), cache->pinned, |
6662 | cache->reserved, cache->ro ? "[readonly]" : ""); | 6664 | cache->reserved, cache->ro ? "[readonly]" : ""); |
@@ -7019,7 +7021,7 @@ again: | |||
7019 | /*DEFAULT_RATELIMIT_BURST*/ 1); | 7021 | /*DEFAULT_RATELIMIT_BURST*/ 1); |
7020 | if (__ratelimit(&_rs)) | 7022 | if (__ratelimit(&_rs)) |
7021 | WARN(1, KERN_DEBUG | 7023 | WARN(1, KERN_DEBUG |
7022 | "btrfs: block rsv returned %d\n", ret); | 7024 | "BTRFS: block rsv returned %d\n", ret); |
7023 | } | 7025 | } |
7024 | try_reserve: | 7026 | try_reserve: |
7025 | ret = reserve_metadata_bytes(root, block_rsv, blocksize, | 7027 | ret = reserve_metadata_bytes(root, block_rsv, blocksize, |
@@ -7767,7 +7769,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, | |||
7767 | 7769 | ||
7768 | btrfs_end_transaction_throttle(trans, tree_root); | 7770 | btrfs_end_transaction_throttle(trans, tree_root); |
7769 | if (!for_reloc && btrfs_need_cleaner_sleep(root)) { | 7771 | if (!for_reloc && btrfs_need_cleaner_sleep(root)) { |
7770 | pr_debug("btrfs: drop snapshot early exit\n"); | 7772 | pr_debug("BTRFS: drop snapshot early exit\n"); |
7771 | err = -EAGAIN; | 7773 | err = -EAGAIN; |
7772 | goto out_free; | 7774 | goto out_free; |
7773 | } | 7775 | } |
@@ -8427,7 +8429,7 @@ static void __link_block_group(struct btrfs_space_info *space_info, | |||
8427 | ret = kobject_add(kobj, &space_info->kobj, "%s", | 8429 | ret = kobject_add(kobj, &space_info->kobj, "%s", |
8428 | get_raid_name(index)); | 8430 | get_raid_name(index)); |
8429 | if (ret) { | 8431 | if (ret) { |
8430 | pr_warn("btrfs: failed to add kobject for block cache. ignoring.\n"); | 8432 | pr_warn("BTRFS: failed to add kobject for block cache. ignoring.\n"); |
8431 | kobject_put(&space_info->kobj); | 8433 | kobject_put(&space_info->kobj); |
8432 | } | 8434 | } |
8433 | } | 8435 | } |