diff options
Diffstat (limited to 'fs/btrfs/compression.c')
-rw-r--r-- | fs/btrfs/compression.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 2436163d5436..ee848d8585d9 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c | |||
@@ -137,7 +137,8 @@ static int check_compressed_csum(struct inode *inode, | |||
137 | kunmap_atomic(kaddr, KM_USER0); | 137 | kunmap_atomic(kaddr, KM_USER0); |
138 | 138 | ||
139 | if (csum != *cb_sum) { | 139 | if (csum != *cb_sum) { |
140 | printk("btrfs csum failed ino %lu extent %llu csum %u " | 140 | printk(KERN_INFO "btrfs csum failed ino %lu " |
141 | "extent %llu csum %u " | ||
141 | "wanted %u mirror %d\n", inode->i_ino, | 142 | "wanted %u mirror %d\n", inode->i_ino, |
142 | (unsigned long long)disk_start, | 143 | (unsigned long long)disk_start, |
143 | csum, *cb_sum, cb->mirror_num); | 144 | csum, *cb_sum, cb->mirror_num); |
@@ -217,7 +218,7 @@ csum_failed: | |||
217 | * we have verified the checksum already, set page | 218 | * we have verified the checksum already, set page |
218 | * checked so the end_io handlers know about it | 219 | * checked so the end_io handlers know about it |
219 | */ | 220 | */ |
220 | while(bio_index < cb->orig_bio->bi_vcnt) { | 221 | while (bio_index < cb->orig_bio->bi_vcnt) { |
221 | SetPageChecked(bvec->bv_page); | 222 | SetPageChecked(bvec->bv_page); |
222 | bvec++; | 223 | bvec++; |
223 | bio_index++; | 224 | bio_index++; |
@@ -246,7 +247,7 @@ static noinline int end_compressed_writeback(struct inode *inode, u64 start, | |||
246 | int i; | 247 | int i; |
247 | int ret; | 248 | int ret; |
248 | 249 | ||
249 | while(nr_pages > 0) { | 250 | while (nr_pages > 0) { |
250 | ret = find_get_pages_contig(inode->i_mapping, index, | 251 | ret = find_get_pages_contig(inode->i_mapping, index, |
251 | min_t(unsigned long, | 252 | min_t(unsigned long, |
252 | nr_pages, ARRAY_SIZE(pages)), pages); | 253 | nr_pages, ARRAY_SIZE(pages)), pages); |
@@ -463,7 +464,7 @@ static noinline int add_ra_bio_pages(struct inode *inode, | |||
463 | end_index = (i_size_read(inode) - 1) >> PAGE_CACHE_SHIFT; | 464 | end_index = (i_size_read(inode) - 1) >> PAGE_CACHE_SHIFT; |
464 | 465 | ||
465 | pagevec_init(&pvec, 0); | 466 | pagevec_init(&pvec, 0); |
466 | while(last_offset < compressed_end) { | 467 | while (last_offset < compressed_end) { |
467 | page_index = last_offset >> PAGE_CACHE_SHIFT; | 468 | page_index = last_offset >> PAGE_CACHE_SHIFT; |
468 | 469 | ||
469 | if (page_index > end_index) | 470 | if (page_index > end_index) |
@@ -697,9 +698,8 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, | |||
697 | ret = btrfs_bio_wq_end_io(root->fs_info, comp_bio, 0); | 698 | ret = btrfs_bio_wq_end_io(root->fs_info, comp_bio, 0); |
698 | BUG_ON(ret); | 699 | BUG_ON(ret); |
699 | 700 | ||
700 | if (!btrfs_test_flag(inode, NODATASUM)) { | 701 | if (!btrfs_test_flag(inode, NODATASUM)) |
701 | btrfs_lookup_bio_sums(root, inode, comp_bio, sums); | 702 | btrfs_lookup_bio_sums(root, inode, comp_bio, sums); |
702 | } | ||
703 | 703 | ||
704 | ret = btrfs_map_bio(root, READ, comp_bio, mirror_num, 0); | 704 | ret = btrfs_map_bio(root, READ, comp_bio, mirror_num, 0); |
705 | BUG_ON(ret); | 705 | BUG_ON(ret); |