aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent_io.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2015-10-08 05:37:06 -0400
committerDavid Sterba <dsterba@suse.com>2015-10-08 07:08:03 -0400
commitf14d104dbdb5044dac9acd0e983ffb60f706c746 (patch)
treea1fae623eade7120397723d6edef6a99356997f5 /fs/btrfs/extent_io.c
parent9464732266862f6044e4708dca6c4b2a83dd937b (diff)
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>
Diffstat (limited to 'fs/btrfs/extent_io.c')
-rw-r--r--fs/btrfs/extent_io.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index bb318b4e5dd0..c7a33913188b 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -5563,13 +5563,15 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
5563 unsigned long src_i; 5563 unsigned long src_i;
5564 5564
5565 if (src_offset + len > dst->len) { 5565 if (src_offset + len > dst->len) {
5566 printk(KERN_ERR "BTRFS: memmove bogus src_offset %lu move " 5566 btrfs_err(dst->fs_info,
5567 "len %lu dst len %lu\n", src_offset, len, dst->len); 5567 "memmove bogus src_offset %lu move "
5568 "len %lu dst len %lu", src_offset, len, dst->len);
5568 BUG_ON(1); 5569 BUG_ON(1);
5569 } 5570 }
5570 if (dst_offset + len > dst->len) { 5571 if (dst_offset + len > dst->len) {
5571 printk(KERN_ERR "BTRFS: memmove bogus dst_offset %lu move " 5572 btrfs_err(dst->fs_info,
5572 "len %lu dst len %lu\n", dst_offset, len, dst->len); 5573 "memmove bogus dst_offset %lu move "
5574 "len %lu dst len %lu", dst_offset, len, dst->len);
5573 BUG_ON(1); 5575 BUG_ON(1);
5574 } 5576 }
5575 5577
@@ -5609,13 +5611,13 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
5609 unsigned long src_i; 5611 unsigned long src_i;
5610 5612
5611 if (src_offset + len > dst->len) { 5613 if (src_offset + len > dst->len) {
5612 printk(KERN_ERR "BTRFS: memmove bogus src_offset %lu move " 5614 btrfs_err(dst->fs_info, "memmove bogus src_offset %lu move "
5613 "len %lu len %lu\n", src_offset, len, dst->len); 5615 "len %lu len %lu", src_offset, len, dst->len);
5614 BUG_ON(1); 5616 BUG_ON(1);
5615 } 5617 }
5616 if (dst_offset + len > dst->len) { 5618 if (dst_offset + len > dst->len) {
5617 printk(KERN_ERR "BTRFS: memmove bogus dst_offset %lu move " 5619 btrfs_err(dst->fs_info, "memmove bogus dst_offset %lu move "
5618 "len %lu len %lu\n", dst_offset, len, dst->len); 5620 "len %lu len %lu", dst_offset, len, dst->len);
5619 BUG_ON(1); 5621 BUG_ON(1);
5620 } 5622 }
5621 if (dst_offset < src_offset) { 5623 if (dst_offset < src_offset) {