diff options
Diffstat (limited to 'fs/btrfs/extent_io.c')
-rw-r--r-- | fs/btrfs/extent_io.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 3e7d604004f9..5172e8253c4a 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
@@ -61,9 +61,8 @@ void btrfs_leak_debug_check(void) | |||
61 | state = list_entry(states.next, struct extent_state, leak_list); | 61 | state = list_entry(states.next, struct extent_state, leak_list); |
62 | printk(KERN_ERR "btrfs state leak: start %llu end %llu " | 62 | printk(KERN_ERR "btrfs state leak: start %llu end %llu " |
63 | "state %lu in tree %p refs %d\n", | 63 | "state %lu in tree %p refs %d\n", |
64 | (unsigned long long)state->start, | 64 | state->start, state->end, state->state, state->tree, |
65 | (unsigned long long)state->end, | 65 | atomic_read(&state->refs)); |
66 | state->state, state->tree, atomic_read(&state->refs)); | ||
67 | list_del(&state->leak_list); | 66 | list_del(&state->leak_list); |
68 | kmem_cache_free(extent_state_cache, state); | 67 | kmem_cache_free(extent_state_cache, state); |
69 | } | 68 | } |
@@ -71,8 +70,8 @@ void btrfs_leak_debug_check(void) | |||
71 | while (!list_empty(&buffers)) { | 70 | while (!list_empty(&buffers)) { |
72 | eb = list_entry(buffers.next, struct extent_buffer, leak_list); | 71 | eb = list_entry(buffers.next, struct extent_buffer, leak_list); |
73 | printk(KERN_ERR "btrfs buffer leak start %llu len %lu " | 72 | printk(KERN_ERR "btrfs buffer leak start %llu len %lu " |
74 | "refs %d\n", (unsigned long long)eb->start, | 73 | "refs %d\n", |
75 | eb->len, atomic_read(&eb->refs)); | 74 | eb->start, eb->len, atomic_read(&eb->refs)); |
76 | list_del(&eb->leak_list); | 75 | list_del(&eb->leak_list); |
77 | kmem_cache_free(extent_buffer_cache, eb); | 76 | kmem_cache_free(extent_buffer_cache, eb); |
78 | } | 77 | } |
@@ -88,11 +87,7 @@ static inline void __btrfs_debug_check_extent_io_range(const char *caller, | |||
88 | if (end >= PAGE_SIZE && (end % 2) == 0 && end != isize - 1) { | 87 | if (end >= PAGE_SIZE && (end % 2) == 0 && end != isize - 1) { |
89 | printk_ratelimited(KERN_DEBUG | 88 | printk_ratelimited(KERN_DEBUG |
90 | "btrfs: %s: ino %llu isize %llu odd range [%llu,%llu]\n", | 89 | "btrfs: %s: ino %llu isize %llu odd range [%llu,%llu]\n", |
91 | caller, | 90 | caller, btrfs_ino(inode), isize, start, end); |
92 | (unsigned long long)btrfs_ino(inode), | ||
93 | (unsigned long long)isize, | ||
94 | (unsigned long long)start, | ||
95 | (unsigned long long)end); | ||
96 | } | 91 | } |
97 | } | 92 | } |
98 | #else | 93 | #else |
@@ -388,8 +383,7 @@ static int insert_state(struct extent_io_tree *tree, | |||
388 | 383 | ||
389 | if (end < start) | 384 | if (end < start) |
390 | WARN(1, KERN_ERR "btrfs end < start %llu %llu\n", | 385 | WARN(1, KERN_ERR "btrfs end < start %llu %llu\n", |
391 | (unsigned long long)end, | 386 | end, start); |
392 | (unsigned long long)start); | ||
393 | state->start = start; | 387 | state->start = start; |
394 | state->end = end; | 388 | state->end = end; |
395 | 389 | ||
@@ -400,9 +394,8 @@ static int insert_state(struct extent_io_tree *tree, | |||
400 | struct extent_state *found; | 394 | struct extent_state *found; |
401 | found = rb_entry(node, struct extent_state, rb_node); | 395 | found = rb_entry(node, struct extent_state, rb_node); |
402 | printk(KERN_ERR "btrfs found node %llu %llu on insert of " | 396 | printk(KERN_ERR "btrfs found node %llu %llu on insert of " |
403 | "%llu %llu\n", (unsigned long long)found->start, | 397 | "%llu %llu\n", |
404 | (unsigned long long)found->end, | 398 | found->start, found->end, start, end); |
405 | (unsigned long long)start, (unsigned long long)end); | ||
406 | return -EEXIST; | 399 | return -EEXIST; |
407 | } | 400 | } |
408 | state->tree = tree; | 401 | state->tree = tree; |
@@ -3298,8 +3291,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, | |||
3298 | if (!PageWriteback(page)) { | 3291 | if (!PageWriteback(page)) { |
3299 | printk(KERN_ERR "btrfs warning page %lu not " | 3292 | printk(KERN_ERR "btrfs warning page %lu not " |
3300 | "writeback, cur %llu end %llu\n", | 3293 | "writeback, cur %llu end %llu\n", |
3301 | page->index, (unsigned long long)cur, | 3294 | page->index, cur, end); |
3302 | (unsigned long long)end); | ||
3303 | } | 3295 | } |
3304 | 3296 | ||
3305 | ret = submit_extent_page(write_flags, tree, page, | 3297 | ret = submit_extent_page(write_flags, tree, page, |
@@ -4923,8 +4915,8 @@ int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start, | |||
4923 | 4915 | ||
4924 | if (start + min_len > eb->len) { | 4916 | if (start + min_len > eb->len) { |
4925 | WARN(1, KERN_ERR "btrfs bad mapping eb start %llu len %lu, " | 4917 | WARN(1, KERN_ERR "btrfs bad mapping eb start %llu len %lu, " |
4926 | "wanted %lu %lu\n", (unsigned long long)eb->start, | 4918 | "wanted %lu %lu\n", |
4927 | eb->len, start, min_len); | 4919 | eb->start, eb->len, start, min_len); |
4928 | return -EINVAL; | 4920 | return -EINVAL; |
4929 | } | 4921 | } |
4930 | 4922 | ||