aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fs/btrfs/backref.c24
-rw-r--r--fs/btrfs/check-integrity.c293
-rw-r--r--fs/btrfs/compression.c5
-rw-r--r--fs/btrfs/ctree.c6
-rw-r--r--fs/btrfs/delayed-inode.c10
-rw-r--r--fs/btrfs/dev-replace.c2
-rw-r--r--fs/btrfs/disk-io.c25
-rw-r--r--fs/btrfs/extent-tree.c47
-rw-r--r--fs/btrfs/extent_io.c30
-rw-r--r--fs/btrfs/file-item.c4
-rw-r--r--fs/btrfs/free-space-cache.c6
-rw-r--r--fs/btrfs/inode.c23
-rw-r--r--fs/btrfs/ioctl.c10
-rw-r--r--fs/btrfs/ordered-data.c11
-rw-r--r--fs/btrfs/print-tree.c79
-rw-r--r--fs/btrfs/qgroup.c10
-rw-r--r--fs/btrfs/relocation.c7
-rw-r--r--fs/btrfs/root-tree.c3
-rw-r--r--fs/btrfs/scrub.c16
-rw-r--r--fs/btrfs/super.c10
-rw-r--r--fs/btrfs/transaction.c3
-rw-r--r--fs/btrfs/volumes.c19
22 files changed, 221 insertions, 422 deletions
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index 977e9c66f2e3..3da8f42e08a9 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -295,10 +295,9 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info,
295 ret = btrfs_search_old_slot(root, &ref->key_for_search, path, time_seq); 295 ret = btrfs_search_old_slot(root, &ref->key_for_search, path, time_seq);
296 pr_debug("search slot in root %llu (level %d, ref count %d) returned " 296 pr_debug("search slot in root %llu (level %d, ref count %d) returned "
297 "%d for key (%llu %u %llu)\n", 297 "%d for key (%llu %u %llu)\n",
298 (unsigned long long)ref->root_id, level, ref->count, ret, 298 ref->root_id, level, ref->count, ret,
299 (unsigned long long)ref->key_for_search.objectid, 299 ref->key_for_search.objectid, ref->key_for_search.type,
300 ref->key_for_search.type, 300 ref->key_for_search.offset);
301 (unsigned long long)ref->key_for_search.offset);
302 if (ret < 0) 301 if (ret < 0)
303 goto out; 302 goto out;
304 303
@@ -1328,8 +1327,7 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical,
1328 found_key->type != BTRFS_METADATA_ITEM_KEY) || 1327 found_key->type != BTRFS_METADATA_ITEM_KEY) ||
1329 found_key->objectid > logical || 1328 found_key->objectid > logical ||
1330 found_key->objectid + size <= logical) { 1329 found_key->objectid + size <= logical) {
1331 pr_debug("logical %llu is not within any extent\n", 1330 pr_debug("logical %llu is not within any extent\n", logical);
1332 (unsigned long long)logical);
1333 return -ENOENT; 1331 return -ENOENT;
1334 } 1332 }
1335 1333
@@ -1342,11 +1340,8 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical,
1342 1340
1343 pr_debug("logical %llu is at position %llu within the extent (%llu " 1341 pr_debug("logical %llu is at position %llu within the extent (%llu "
1344 "EXTENT_ITEM %llu) flags %#llx size %u\n", 1342 "EXTENT_ITEM %llu) flags %#llx size %u\n",
1345 (unsigned long long)logical, 1343 logical, logical - found_key->objectid, found_key->objectid,
1346 (unsigned long long)(logical - found_key->objectid), 1344 found_key->offset, flags, item_size);
1347 (unsigned long long)found_key->objectid,
1348 (unsigned long long)found_key->offset,
1349 (unsigned long long)flags, item_size);
1350 1345
1351 WARN_ON(!flags_ret); 1346 WARN_ON(!flags_ret);
1352 if (flags_ret) { 1347 if (flags_ret) {
@@ -1518,7 +1513,7 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info,
1518 while (!ret && (root_node = ulist_next(roots, &root_uiter))) { 1513 while (!ret && (root_node = ulist_next(roots, &root_uiter))) {
1519 pr_debug("root %llu references leaf %llu, data list " 1514 pr_debug("root %llu references leaf %llu, data list "
1520 "%#llx\n", root_node->val, ref_node->val, 1515 "%#llx\n", root_node->val, ref_node->val,
1521 (long long)ref_node->aux); 1516 ref_node->aux);
1522 ret = iterate_leaf_refs((struct extent_inode_elem *) 1517 ret = iterate_leaf_refs((struct extent_inode_elem *)
1523 (uintptr_t)ref_node->aux, 1518 (uintptr_t)ref_node->aux,
1524 root_node->val, 1519 root_node->val,
@@ -1610,9 +1605,8 @@ static int iterate_inode_refs(u64 inum, struct btrfs_root *fs_root,
1610 name_len = btrfs_inode_ref_name_len(eb, iref); 1605 name_len = btrfs_inode_ref_name_len(eb, iref);
1611 /* path must be released before calling iterate()! */ 1606 /* path must be released before calling iterate()! */
1612 pr_debug("following ref at offset %u for inode %llu in " 1607 pr_debug("following ref at offset %u for inode %llu in "
1613 "tree %llu\n", cur, 1608 "tree %llu\n", cur, found_key.objectid,
1614 (unsigned long long)found_key.objectid, 1609 fs_root->objectid);
1615 (unsigned long long)fs_root->objectid);
1616 ret = iterate(parent, name_len, 1610 ret = iterate(parent, name_len,
1617 (unsigned long)(iref + 1), eb, ctx); 1611 (unsigned long)(iref + 1), eb, ctx);
1618 if (ret) 1612 if (ret)
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index 07f39a3dedb0..fa68c8ab9a15 100644
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -701,15 +701,13 @@ static int btrfsic_process_superblock(struct btrfsic_state *state,
701 next_bytenr = btrfs_super_root(selected_super); 701 next_bytenr = btrfs_super_root(selected_super);
702 if (state->print_mask & 702 if (state->print_mask &
703 BTRFSIC_PRINT_MASK_ROOT_CHUNK_LOG_TREE_LOCATION) 703 BTRFSIC_PRINT_MASK_ROOT_CHUNK_LOG_TREE_LOCATION)
704 printk(KERN_INFO "root@%llu\n", 704 printk(KERN_INFO "root@%llu\n", next_bytenr);
705 (unsigned long long)next_bytenr);
706 break; 705 break;
707 case 1: 706 case 1:
708 next_bytenr = btrfs_super_chunk_root(selected_super); 707 next_bytenr = btrfs_super_chunk_root(selected_super);
709 if (state->print_mask & 708 if (state->print_mask &
710 BTRFSIC_PRINT_MASK_ROOT_CHUNK_LOG_TREE_LOCATION) 709 BTRFSIC_PRINT_MASK_ROOT_CHUNK_LOG_TREE_LOCATION)
711 printk(KERN_INFO "chunk@%llu\n", 710 printk(KERN_INFO "chunk@%llu\n", next_bytenr);
712 (unsigned long long)next_bytenr);
713 break; 711 break;
714 case 2: 712 case 2:
715 next_bytenr = btrfs_super_log_root(selected_super); 713 next_bytenr = btrfs_super_log_root(selected_super);
@@ -717,8 +715,7 @@ static int btrfsic_process_superblock(struct btrfsic_state *state,
717 continue; 715 continue;
718 if (state->print_mask & 716 if (state->print_mask &
719 BTRFSIC_PRINT_MASK_ROOT_CHUNK_LOG_TREE_LOCATION) 717 BTRFSIC_PRINT_MASK_ROOT_CHUNK_LOG_TREE_LOCATION)
720 printk(KERN_INFO "log@%llu\n", 718 printk(KERN_INFO "log@%llu\n", next_bytenr);
721 (unsigned long long)next_bytenr);
722 break; 719 break;
723 } 720 }
724 721
@@ -727,7 +724,7 @@ static int btrfsic_process_superblock(struct btrfsic_state *state,
727 next_bytenr, state->metablock_size); 724 next_bytenr, state->metablock_size);
728 if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES) 725 if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
729 printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n", 726 printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n",
730 (unsigned long long)next_bytenr, num_copies); 727 next_bytenr, num_copies);
731 728
732 for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) { 729 for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) {
733 struct btrfsic_block *next_block; 730 struct btrfsic_block *next_block;
@@ -742,8 +739,7 @@ static int btrfsic_process_superblock(struct btrfsic_state *state,
742 printk(KERN_INFO "btrfsic:" 739 printk(KERN_INFO "btrfsic:"
743 " btrfsic_map_block(root @%llu," 740 " btrfsic_map_block(root @%llu,"
744 " mirror %d) failed!\n", 741 " mirror %d) failed!\n",
745 (unsigned long long)next_bytenr, 742 next_bytenr, mirror_num);
746 mirror_num);
747 kfree(selected_super); 743 kfree(selected_super);
748 return -1; 744 return -1;
749 } 745 }
@@ -767,7 +763,6 @@ static int btrfsic_process_superblock(struct btrfsic_state *state,
767 if (ret < (int)PAGE_CACHE_SIZE) { 763 if (ret < (int)PAGE_CACHE_SIZE) {
768 printk(KERN_INFO 764 printk(KERN_INFO
769 "btrfsic: read @logical %llu failed!\n", 765 "btrfsic: read @logical %llu failed!\n",
770 (unsigned long long)
771 tmp_next_block_ctx.start); 766 tmp_next_block_ctx.start);
772 btrfsic_release_block_ctx(&tmp_next_block_ctx); 767 btrfsic_release_block_ctx(&tmp_next_block_ctx);
773 kfree(selected_super); 768 kfree(selected_super);
@@ -847,10 +842,8 @@ static int btrfsic_process_superblock_dev_mirror(
847 printk_in_rcu(KERN_INFO "New initial S-block (bdev %p, %s)" 842 printk_in_rcu(KERN_INFO "New initial S-block (bdev %p, %s)"
848 " @%llu (%s/%llu/%d)\n", 843 " @%llu (%s/%llu/%d)\n",
849 superblock_bdev, 844 superblock_bdev,
850 rcu_str_deref(device->name), 845 rcu_str_deref(device->name), dev_bytenr,
851 (unsigned long long)dev_bytenr, 846 dev_state->name, dev_bytenr,
852 dev_state->name,
853 (unsigned long long)dev_bytenr,
854 superblock_mirror_num); 847 superblock_mirror_num);
855 list_add(&superblock_tmp->all_blocks_node, 848 list_add(&superblock_tmp->all_blocks_node,
856 &state->all_blocks_list); 849 &state->all_blocks_list);
@@ -906,7 +899,7 @@ static int btrfsic_process_superblock_dev_mirror(
906 next_bytenr, state->metablock_size); 899 next_bytenr, state->metablock_size);
907 if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES) 900 if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
908 printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n", 901 printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n",
909 (unsigned long long)next_bytenr, num_copies); 902 next_bytenr, num_copies);
910 for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) { 903 for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) {
911 struct btrfsic_block *next_block; 904 struct btrfsic_block *next_block;
912 struct btrfsic_block_data_ctx tmp_next_block_ctx; 905 struct btrfsic_block_data_ctx tmp_next_block_ctx;
@@ -918,8 +911,7 @@ static int btrfsic_process_superblock_dev_mirror(
918 mirror_num)) { 911 mirror_num)) {
919 printk(KERN_INFO "btrfsic: btrfsic_map_block(" 912 printk(KERN_INFO "btrfsic: btrfsic_map_block("
920 "bytenr @%llu, mirror %d) failed!\n", 913 "bytenr @%llu, mirror %d) failed!\n",
921 (unsigned long long)next_bytenr, 914 next_bytenr, mirror_num);
922 mirror_num);
923 brelse(bh); 915 brelse(bh);
924 return -1; 916 return -1;
925 } 917 }
@@ -1009,13 +1001,9 @@ continue_with_new_stack_frame:
1009 printk(KERN_INFO 1001 printk(KERN_INFO
1010 "leaf %llu items %d generation %llu" 1002 "leaf %llu items %d generation %llu"
1011 " owner %llu\n", 1003 " owner %llu\n",
1012 (unsigned long long) 1004 sf->block_ctx->start, sf->nr,
1013 sf->block_ctx->start,
1014 sf->nr,
1015 (unsigned long long)
1016 btrfs_stack_header_generation( 1005 btrfs_stack_header_generation(
1017 &leafhdr->header), 1006 &leafhdr->header),
1018 (unsigned long long)
1019 btrfs_stack_header_owner( 1007 btrfs_stack_header_owner(
1020 &leafhdr->header)); 1008 &leafhdr->header));
1021 } 1009 }
@@ -1137,13 +1125,10 @@ leaf_item_out_of_bounce_error:
1137 if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE) 1125 if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
1138 printk(KERN_INFO "node %llu level %d items %d" 1126 printk(KERN_INFO "node %llu level %d items %d"
1139 " generation %llu owner %llu\n", 1127 " generation %llu owner %llu\n",
1140 (unsigned long long)
1141 sf->block_ctx->start, 1128 sf->block_ctx->start,
1142 nodehdr->header.level, sf->nr, 1129 nodehdr->header.level, sf->nr,
1143 (unsigned long long)
1144 btrfs_stack_header_generation( 1130 btrfs_stack_header_generation(
1145 &nodehdr->header), 1131 &nodehdr->header),
1146 (unsigned long long)
1147 btrfs_stack_header_owner( 1132 btrfs_stack_header_owner(
1148 &nodehdr->header)); 1133 &nodehdr->header));
1149 } 1134 }
@@ -1294,7 +1279,7 @@ static int btrfsic_create_link_to_next_block(
1294 next_bytenr, state->metablock_size); 1279 next_bytenr, state->metablock_size);
1295 if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES) 1280 if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
1296 printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n", 1281 printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n",
1297 (unsigned long long)next_bytenr, *num_copiesp); 1282 next_bytenr, *num_copiesp);
1298 *mirror_nump = 1; 1283 *mirror_nump = 1;
1299 } 1284 }
1300 1285
@@ -1311,7 +1296,7 @@ static int btrfsic_create_link_to_next_block(
1311 if (ret) { 1296 if (ret) {
1312 printk(KERN_INFO 1297 printk(KERN_INFO
1313 "btrfsic: btrfsic_map_block(@%llu, mirror=%d) failed!\n", 1298 "btrfsic: btrfsic_map_block(@%llu, mirror=%d) failed!\n",
1314 (unsigned long long)next_bytenr, *mirror_nump); 1299 next_bytenr, *mirror_nump);
1315 btrfsic_release_block_ctx(next_block_ctx); 1300 btrfsic_release_block_ctx(next_block_ctx);
1316 *next_blockp = NULL; 1301 *next_blockp = NULL;
1317 return -1; 1302 return -1;
@@ -1339,20 +1324,16 @@ static int btrfsic_create_link_to_next_block(
1339 "Referenced block @%llu (%s/%llu/%d)" 1324 "Referenced block @%llu (%s/%llu/%d)"
1340 " found in hash table, %c," 1325 " found in hash table, %c,"
1341 " bytenr mismatch (!= stored %llu).\n", 1326 " bytenr mismatch (!= stored %llu).\n",
1342 (unsigned long long)next_bytenr, 1327 next_bytenr, next_block_ctx->dev->name,
1343 next_block_ctx->dev->name, 1328 next_block_ctx->dev_bytenr, *mirror_nump,
1344 (unsigned long long)next_block_ctx->dev_bytenr,
1345 *mirror_nump,
1346 btrfsic_get_block_type(state, next_block), 1329 btrfsic_get_block_type(state, next_block),
1347 (unsigned long long)next_block->logical_bytenr); 1330 next_block->logical_bytenr);
1348 } else if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE) 1331 } else if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
1349 printk(KERN_INFO 1332 printk(KERN_INFO
1350 "Referenced block @%llu (%s/%llu/%d)" 1333 "Referenced block @%llu (%s/%llu/%d)"
1351 " found in hash table, %c.\n", 1334 " found in hash table, %c.\n",
1352 (unsigned long long)next_bytenr, 1335 next_bytenr, next_block_ctx->dev->name,
1353 next_block_ctx->dev->name, 1336 next_block_ctx->dev_bytenr, *mirror_nump,
1354 (unsigned long long)next_block_ctx->dev_bytenr,
1355 *mirror_nump,
1356 btrfsic_get_block_type(state, next_block)); 1337 btrfsic_get_block_type(state, next_block));
1357 next_block->logical_bytenr = next_bytenr; 1338 next_block->logical_bytenr = next_bytenr;
1358 1339
@@ -1404,7 +1385,7 @@ static int btrfsic_create_link_to_next_block(
1404 if (ret < (int)next_block_ctx->len) { 1385 if (ret < (int)next_block_ctx->len) {
1405 printk(KERN_INFO 1386 printk(KERN_INFO
1406 "btrfsic: read block @logical %llu failed!\n", 1387 "btrfsic: read block @logical %llu failed!\n",
1407 (unsigned long long)next_bytenr); 1388 next_bytenr);
1408 btrfsic_release_block_ctx(next_block_ctx); 1389 btrfsic_release_block_ctx(next_block_ctx);
1409 *next_blockp = NULL; 1390 *next_blockp = NULL;
1410 return -1; 1391 return -1;
@@ -1452,7 +1433,6 @@ static int btrfsic_handle_extent_data(
1452 if (state->print_mask & BTRFSIC_PRINT_MASK_VERY_VERBOSE) 1433 if (state->print_mask & BTRFSIC_PRINT_MASK_VERY_VERBOSE)
1453 printk(KERN_INFO "extent_data: type %u, disk_bytenr = %llu\n", 1434 printk(KERN_INFO "extent_data: type %u, disk_bytenr = %llu\n",
1454 file_extent_item.type, 1435 file_extent_item.type,
1455 (unsigned long long)
1456 btrfs_stack_file_extent_disk_bytenr( 1436 btrfs_stack_file_extent_disk_bytenr(
1457 &file_extent_item)); 1437 &file_extent_item));
1458 return 0; 1438 return 0;
@@ -1478,11 +1458,9 @@ static int btrfsic_handle_extent_data(
1478 printk(KERN_INFO "extent_data: type %u, disk_bytenr = %llu," 1458 printk(KERN_INFO "extent_data: type %u, disk_bytenr = %llu,"
1479 " offset = %llu, num_bytes = %llu\n", 1459 " offset = %llu, num_bytes = %llu\n",
1480 file_extent_item.type, 1460 file_extent_item.type,
1481 (unsigned long long)
1482 btrfs_stack_file_extent_disk_bytenr(&file_extent_item), 1461 btrfs_stack_file_extent_disk_bytenr(&file_extent_item),
1483 (unsigned long long)
1484 btrfs_stack_file_extent_offset(&file_extent_item), 1462 btrfs_stack_file_extent_offset(&file_extent_item),
1485 (unsigned long long)num_bytes); 1463 num_bytes);
1486 while (num_bytes > 0) { 1464 while (num_bytes > 0) {
1487 u32 chunk_len; 1465 u32 chunk_len;
1488 int num_copies; 1466 int num_copies;
@@ -1498,7 +1476,7 @@ static int btrfsic_handle_extent_data(
1498 next_bytenr, state->datablock_size); 1476 next_bytenr, state->datablock_size);
1499 if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES) 1477 if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
1500 printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n", 1478 printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n",
1501 (unsigned long long)next_bytenr, num_copies); 1479 next_bytenr, num_copies);
1502 for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) { 1480 for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) {
1503 struct btrfsic_block_data_ctx next_block_ctx; 1481 struct btrfsic_block_data_ctx next_block_ctx;
1504 struct btrfsic_block *next_block; 1482 struct btrfsic_block *next_block;
@@ -1510,8 +1488,7 @@ static int btrfsic_handle_extent_data(
1510 if (state->print_mask & BTRFSIC_PRINT_MASK_VERY_VERBOSE) 1488 if (state->print_mask & BTRFSIC_PRINT_MASK_VERY_VERBOSE)
1511 printk(KERN_INFO 1489 printk(KERN_INFO
1512 "\tdisk_bytenr = %llu, num_bytes %u\n", 1490 "\tdisk_bytenr = %llu, num_bytes %u\n",
1513 (unsigned long long)next_bytenr, 1491 next_bytenr, chunk_len);
1514 chunk_len);
1515 ret = btrfsic_map_block(state, next_bytenr, 1492 ret = btrfsic_map_block(state, next_bytenr,
1516 chunk_len, &next_block_ctx, 1493 chunk_len, &next_block_ctx,
1517 mirror_num); 1494 mirror_num);
@@ -1519,8 +1496,7 @@ static int btrfsic_handle_extent_data(
1519 printk(KERN_INFO 1496 printk(KERN_INFO
1520 "btrfsic: btrfsic_map_block(@%llu," 1497 "btrfsic: btrfsic_map_block(@%llu,"
1521 " mirror=%d) failed!\n", 1498 " mirror=%d) failed!\n",
1522 (unsigned long long)next_bytenr, 1499 next_bytenr, mirror_num);
1523 mirror_num);
1524 return -1; 1500 return -1;
1525 } 1501 }
1526 1502
@@ -1549,12 +1525,10 @@ static int btrfsic_handle_extent_data(
1549 " found in hash table, D," 1525 " found in hash table, D,"
1550 " bytenr mismatch" 1526 " bytenr mismatch"
1551 " (!= stored %llu).\n", 1527 " (!= stored %llu).\n",
1552 (unsigned long long)next_bytenr, 1528 next_bytenr,
1553 next_block_ctx.dev->name, 1529 next_block_ctx.dev->name,
1554 (unsigned long long)
1555 next_block_ctx.dev_bytenr, 1530 next_block_ctx.dev_bytenr,
1556 mirror_num, 1531 mirror_num,
1557 (unsigned long long)
1558 next_block->logical_bytenr); 1532 next_block->logical_bytenr);
1559 } 1533 }
1560 next_block->logical_bytenr = next_bytenr; 1534 next_block->logical_bytenr = next_bytenr;
@@ -1681,7 +1655,7 @@ static int btrfsic_read_block(struct btrfsic_state *state,
1681 if (block_ctx->dev_bytenr & ((u64)PAGE_CACHE_SIZE - 1)) { 1655 if (block_ctx->dev_bytenr & ((u64)PAGE_CACHE_SIZE - 1)) {
1682 printk(KERN_INFO 1656 printk(KERN_INFO
1683 "btrfsic: read_block() with unaligned bytenr %llu\n", 1657 "btrfsic: read_block() with unaligned bytenr %llu\n",
1684 (unsigned long long)block_ctx->dev_bytenr); 1658 block_ctx->dev_bytenr);
1685 return -1; 1659 return -1;
1686 } 1660 }
1687 1661
@@ -1778,10 +1752,8 @@ static void btrfsic_dump_database(struct btrfsic_state *state)
1778 1752
1779 printk(KERN_INFO "%c-block @%llu (%s/%llu/%d)\n", 1753 printk(KERN_INFO "%c-block @%llu (%s/%llu/%d)\n",
1780 btrfsic_get_block_type(state, b_all), 1754 btrfsic_get_block_type(state, b_all),
1781 (unsigned long long)b_all->logical_bytenr, 1755 b_all->logical_bytenr, b_all->dev_state->name,
1782 b_all->dev_state->name, 1756 b_all->dev_bytenr, b_all->mirror_num);
1783 (unsigned long long)b_all->dev_bytenr,
1784 b_all->mirror_num);
1785 1757
1786 list_for_each(elem_ref_to, &b_all->ref_to_list) { 1758 list_for_each(elem_ref_to, &b_all->ref_to_list) {
1787 const struct btrfsic_block_link *const l = 1759 const struct btrfsic_block_link *const l =
@@ -1793,16 +1765,13 @@ static void btrfsic_dump_database(struct btrfsic_state *state)
1793 " refers %u* to" 1765 " refers %u* to"
1794 " %c @%llu (%s/%llu/%d)\n", 1766 " %c @%llu (%s/%llu/%d)\n",
1795 btrfsic_get_block_type(state, b_all), 1767 btrfsic_get_block_type(state, b_all),
1796 (unsigned long long)b_all->logical_bytenr, 1768 b_all->logical_bytenr, b_all->dev_state->name,
1797 b_all->dev_state->name, 1769 b_all->dev_bytenr, b_all->mirror_num,
1798 (unsigned long long)b_all->dev_bytenr,
1799 b_all->mirror_num,
1800 l->ref_cnt, 1770 l->ref_cnt,
1801 btrfsic_get_block_type(state, l->block_ref_to), 1771 btrfsic_get_block_type(state, l->block_ref_to),
1802 (unsigned long long)
1803 l->block_ref_to->logical_bytenr, 1772 l->block_ref_to->logical_bytenr,
1804 l->block_ref_to->dev_state->name, 1773 l->block_ref_to->dev_state->name,
1805 (unsigned long long)l->block_ref_to->dev_bytenr, 1774 l->block_ref_to->dev_bytenr,
1806 l->block_ref_to->mirror_num); 1775 l->block_ref_to->mirror_num);
1807 } 1776 }
1808 1777
@@ -1816,16 +1785,12 @@ static void btrfsic_dump_database(struct btrfsic_state *state)
1816 " is ref %u* from" 1785 " is ref %u* from"
1817 " %c @%llu (%s/%llu/%d)\n", 1786 " %c @%llu (%s/%llu/%d)\n",
1818 btrfsic_get_block_type(state, b_all), 1787 btrfsic_get_block_type(state, b_all),
1819 (unsigned long long)b_all->logical_bytenr, 1788 b_all->logical_bytenr, b_all->dev_state->name,
1820 b_all->dev_state->name, 1789 b_all->dev_bytenr, b_all->mirror_num,
1821 (unsigned long long)b_all->dev_bytenr,
1822 b_all->mirror_num,
1823 l->ref_cnt, 1790 l->ref_cnt,
1824 btrfsic_get_block_type(state, l->block_ref_from), 1791 btrfsic_get_block_type(state, l->block_ref_from),
1825 (unsigned long long)
1826 l->block_ref_from->logical_bytenr, 1792 l->block_ref_from->logical_bytenr,
1827 l->block_ref_from->dev_state->name, 1793 l->block_ref_from->dev_state->name,
1828 (unsigned long long)
1829 l->block_ref_from->dev_bytenr, 1794 l->block_ref_from->dev_bytenr,
1830 l->block_ref_from->mirror_num); 1795 l->block_ref_from->mirror_num);
1831 } 1796 }
@@ -1942,12 +1907,9 @@ again:
1942 " found in hash table, %c," 1907 " found in hash table, %c,"
1943 " bytenr mismatch" 1908 " bytenr mismatch"
1944 " (!= stored %llu).\n", 1909 " (!= stored %llu).\n",
1945 (unsigned long long)bytenr, 1910 bytenr, dev_state->name, dev_bytenr,
1946 dev_state->name,
1947 (unsigned long long)dev_bytenr,
1948 block->mirror_num, 1911 block->mirror_num,
1949 btrfsic_get_block_type(state, block), 1912 btrfsic_get_block_type(state, block),
1950 (unsigned long long)
1951 block->logical_bytenr); 1913 block->logical_bytenr);
1952 block->logical_bytenr = bytenr; 1914 block->logical_bytenr = bytenr;
1953 } else if (state->print_mask & 1915 } else if (state->print_mask &
@@ -1955,9 +1917,7 @@ again:
1955 printk(KERN_INFO 1917 printk(KERN_INFO
1956 "Written block @%llu (%s/%llu/%d)" 1918 "Written block @%llu (%s/%llu/%d)"
1957 " found in hash table, %c.\n", 1919 " found in hash table, %c.\n",
1958 (unsigned long long)bytenr, 1920 bytenr, dev_state->name, dev_bytenr,
1959 dev_state->name,
1960 (unsigned long long)dev_bytenr,
1961 block->mirror_num, 1921 block->mirror_num,
1962 btrfsic_get_block_type(state, block)); 1922 btrfsic_get_block_type(state, block));
1963 } else { 1923 } else {
@@ -1973,9 +1933,7 @@ again:
1973 printk(KERN_INFO 1933 printk(KERN_INFO
1974 "Written block @%llu (%s/%llu/%d)" 1934 "Written block @%llu (%s/%llu/%d)"
1975 " found in hash table, %c.\n", 1935 " found in hash table, %c.\n",
1976 (unsigned long long)bytenr, 1936 bytenr, dev_state->name, dev_bytenr,
1977 dev_state->name,
1978 (unsigned long long)dev_bytenr,
1979 block->mirror_num, 1937 block->mirror_num,
1980 btrfsic_get_block_type(state, block)); 1938 btrfsic_get_block_type(state, block));
1981 } 1939 }
@@ -1992,21 +1950,14 @@ again:
1992 " new(gen=%llu)," 1950 " new(gen=%llu),"
1993 " which is referenced by most recent superblock" 1951 " which is referenced by most recent superblock"
1994 " (superblockgen=%llu)!\n", 1952 " (superblockgen=%llu)!\n",
1995 btrfsic_get_block_type(state, block), 1953 btrfsic_get_block_type(state, block), bytenr,
1996 (unsigned long long)bytenr, 1954 dev_state->name, dev_bytenr, block->mirror_num,
1997 dev_state->name, 1955 block->generation,
1998 (unsigned long long)dev_bytenr,
1999 block->mirror_num,
2000 (unsigned long long)block->generation,
2001 (unsigned long long)
2002 btrfs_disk_key_objectid(&block->disk_key), 1956 btrfs_disk_key_objectid(&block->disk_key),
2003 block->disk_key.type, 1957 block->disk_key.type,
2004 (unsigned long long)
2005 btrfs_disk_key_offset(&block->disk_key), 1958 btrfs_disk_key_offset(&block->disk_key),
2006 (unsigned long long)
2007 btrfs_stack_header_generation( 1959 btrfs_stack_header_generation(
2008 (struct btrfs_header *) mapped_datav[0]), 1960 (struct btrfs_header *) mapped_datav[0]),
2009 (unsigned long long)
2010 state->max_superblock_generation); 1961 state->max_superblock_generation);
2011 btrfsic_dump_tree(state); 1962 btrfsic_dump_tree(state);
2012 } 1963 }
@@ -2015,13 +1966,9 @@ again:
2015 printk(KERN_INFO "btrfs: attempt to overwrite %c-block" 1966 printk(KERN_INFO "btrfs: attempt to overwrite %c-block"
2016 " @%llu (%s/%llu/%d), oldgen=%llu, newgen=%llu," 1967 " @%llu (%s/%llu/%d), oldgen=%llu, newgen=%llu,"
2017 " which is not yet iodone!\n", 1968 " which is not yet iodone!\n",
2018 btrfsic_get_block_type(state, block), 1969 btrfsic_get_block_type(state, block), bytenr,
2019 (unsigned long long)bytenr, 1970 dev_state->name, dev_bytenr, block->mirror_num,
2020 dev_state->name, 1971 block->generation,
2021 (unsigned long long)dev_bytenr,
2022 block->mirror_num,
2023 (unsigned long long)block->generation,
2024 (unsigned long long)
2025 btrfs_stack_header_generation( 1972 btrfs_stack_header_generation(
2026 (struct btrfs_header *) 1973 (struct btrfs_header *)
2027 mapped_datav[0])); 1974 mapped_datav[0]));
@@ -2064,7 +2011,7 @@ again:
2064 if (ret) { 2011 if (ret) {
2065 printk(KERN_INFO 2012 printk(KERN_INFO
2066 "btrfsic: btrfsic_map_block(root @%llu)" 2013 "btrfsic: btrfsic_map_block(root @%llu)"
2067 " failed!\n", (unsigned long long)bytenr); 2014 " failed!\n", bytenr);
2068 goto continue_loop; 2015 goto continue_loop;
2069 } 2016 }
2070 block_ctx.datav = mapped_datav; 2017 block_ctx.datav = mapped_datav;
@@ -2148,7 +2095,7 @@ again:
2148 printk(KERN_INFO 2095 printk(KERN_INFO
2149 "btrfsic: btrfsic_process_metablock" 2096 "btrfsic: btrfsic_process_metablock"
2150 "(root @%llu) failed!\n", 2097 "(root @%llu) failed!\n",
2151 (unsigned long long)dev_bytenr); 2098 dev_bytenr);
2152 } else { 2099 } else {
2153 block->is_metadata = 0; 2100 block->is_metadata = 0;
2154 block->mirror_num = 0; /* unknown */ 2101 block->mirror_num = 0; /* unknown */
@@ -2176,8 +2123,7 @@ again:
2176 if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE) 2123 if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
2177 printk(KERN_INFO "Written block (%s/%llu/?)" 2124 printk(KERN_INFO "Written block (%s/%llu/?)"
2178 " !found in hash table, D.\n", 2125 " !found in hash table, D.\n",
2179 dev_state->name, 2126 dev_state->name, dev_bytenr);
2180 (unsigned long long)dev_bytenr);
2181 if (!state->include_extent_data) { 2127 if (!state->include_extent_data) {
2182 /* ignore that written D block */ 2128 /* ignore that written D block */
2183 goto continue_loop; 2129 goto continue_loop;
@@ -2201,9 +2147,7 @@ again:
2201 printk(KERN_INFO 2147 printk(KERN_INFO
2202 "Written block @%llu (%s/%llu/?)" 2148 "Written block @%llu (%s/%llu/?)"
2203 " !found in hash table, M.\n", 2149 " !found in hash table, M.\n",
2204 (unsigned long long)bytenr, 2150 bytenr, dev_state->name, dev_bytenr);
2205 dev_state->name,
2206 (unsigned long long)dev_bytenr);
2207 2151
2208 ret = btrfsic_map_block(state, bytenr, processed_len, 2152 ret = btrfsic_map_block(state, bytenr, processed_len,
2209 &block_ctx, 0); 2153 &block_ctx, 0);
@@ -2211,7 +2155,7 @@ again:
2211 printk(KERN_INFO 2155 printk(KERN_INFO
2212 "btrfsic: btrfsic_map_block(root @%llu)" 2156 "btrfsic: btrfsic_map_block(root @%llu)"
2213 " failed!\n", 2157 " failed!\n",
2214 (unsigned long long)dev_bytenr); 2158 dev_bytenr);
2215 goto continue_loop; 2159 goto continue_loop;
2216 } 2160 }
2217 } 2161 }
@@ -2276,10 +2220,8 @@ again:
2276 printk(KERN_INFO 2220 printk(KERN_INFO
2277 "New written %c-block @%llu (%s/%llu/%d)\n", 2221 "New written %c-block @%llu (%s/%llu/%d)\n",
2278 is_metadata ? 'M' : 'D', 2222 is_metadata ? 'M' : 'D',
2279 (unsigned long long)block->logical_bytenr, 2223 block->logical_bytenr, block->dev_state->name,
2280 block->dev_state->name, 2224 block->dev_bytenr, block->mirror_num);
2281 (unsigned long long)block->dev_bytenr,
2282 block->mirror_num);
2283 list_add(&block->all_blocks_node, &state->all_blocks_list); 2225 list_add(&block->all_blocks_node, &state->all_blocks_list);
2284 btrfsic_block_hashtable_add(block, &state->block_hashtable); 2226 btrfsic_block_hashtable_add(block, &state->block_hashtable);
2285 2227
@@ -2290,7 +2232,7 @@ again:
2290 printk(KERN_INFO 2232 printk(KERN_INFO
2291 "btrfsic: process_metablock(root @%llu)" 2233 "btrfsic: process_metablock(root @%llu)"
2292 " failed!\n", 2234 " failed!\n",
2293 (unsigned long long)dev_bytenr); 2235 dev_bytenr);
2294 } 2236 }
2295 btrfsic_release_block_ctx(&block_ctx); 2237 btrfsic_release_block_ctx(&block_ctx);
2296 } 2238 }
@@ -2328,10 +2270,8 @@ static void btrfsic_bio_end_io(struct bio *bp, int bio_error_status)
2328 "bio_end_io(err=%d) for %c @%llu (%s/%llu/%d)\n", 2270 "bio_end_io(err=%d) for %c @%llu (%s/%llu/%d)\n",
2329 bio_error_status, 2271 bio_error_status,
2330 btrfsic_get_block_type(dev_state->state, block), 2272 btrfsic_get_block_type(dev_state->state, block),
2331 (unsigned long long)block->logical_bytenr, 2273 block->logical_bytenr, dev_state->name,
2332 dev_state->name, 2274 block->dev_bytenr, block->mirror_num);
2333 (unsigned long long)block->dev_bytenr,
2334 block->mirror_num);
2335 next_block = block->next_in_same_bio; 2275 next_block = block->next_in_same_bio;
2336 block->iodone_w_error = iodone_w_error; 2276 block->iodone_w_error = iodone_w_error;
2337 if (block->submit_bio_bh_rw & REQ_FLUSH) { 2277 if (block->submit_bio_bh_rw & REQ_FLUSH) {
@@ -2341,7 +2281,6 @@ static void btrfsic_bio_end_io(struct bio *bp, int bio_error_status)
2341 printk(KERN_INFO 2281 printk(KERN_INFO
2342 "bio_end_io() new %s flush_gen=%llu\n", 2282 "bio_end_io() new %s flush_gen=%llu\n",
2343 dev_state->name, 2283 dev_state->name,
2344 (unsigned long long)
2345 dev_state->last_flush_gen); 2284 dev_state->last_flush_gen);
2346 } 2285 }
2347 if (block->submit_bio_bh_rw & REQ_FUA) 2286 if (block->submit_bio_bh_rw & REQ_FUA)
@@ -2367,10 +2306,8 @@ static void btrfsic_bh_end_io(struct buffer_head *bh, int uptodate)
2367 "bh_end_io(error=%d) for %c @%llu (%s/%llu/%d)\n", 2306 "bh_end_io(error=%d) for %c @%llu (%s/%llu/%d)\n",
2368 iodone_w_error, 2307 iodone_w_error,
2369 btrfsic_get_block_type(dev_state->state, block), 2308 btrfsic_get_block_type(dev_state->state, block),
2370 (unsigned long long)block->logical_bytenr, 2309 block->logical_bytenr, block->dev_state->name,
2371 block->dev_state->name, 2310 block->dev_bytenr, block->mirror_num);
2372 (unsigned long long)block->dev_bytenr,
2373 block->mirror_num);
2374 2311
2375 block->iodone_w_error = iodone_w_error; 2312 block->iodone_w_error = iodone_w_error;
2376 if (block->submit_bio_bh_rw & REQ_FLUSH) { 2313 if (block->submit_bio_bh_rw & REQ_FLUSH) {
@@ -2379,8 +2316,7 @@ static void btrfsic_bh_end_io(struct buffer_head *bh, int uptodate)
2379 BTRFSIC_PRINT_MASK_END_IO_BIO_BH)) 2316 BTRFSIC_PRINT_MASK_END_IO_BIO_BH))
2380 printk(KERN_INFO 2317 printk(KERN_INFO
2381 "bh_end_io() new %s flush_gen=%llu\n", 2318 "bh_end_io() new %s flush_gen=%llu\n",
2382 dev_state->name, 2319 dev_state->name, dev_state->last_flush_gen);
2383 (unsigned long long)dev_state->last_flush_gen);
2384 } 2320 }
2385 if (block->submit_bio_bh_rw & REQ_FUA) 2321 if (block->submit_bio_bh_rw & REQ_FUA)
2386 block->flush_gen = 0; /* FUA completed means block is on disk */ 2322 block->flush_gen = 0; /* FUA completed means block is on disk */
@@ -2405,26 +2341,20 @@ static int btrfsic_process_written_superblock(
2405 printk(KERN_INFO 2341 printk(KERN_INFO
2406 "btrfsic: superblock @%llu (%s/%llu/%d)" 2342 "btrfsic: superblock @%llu (%s/%llu/%d)"
2407 " with old gen %llu <= %llu\n", 2343 " with old gen %llu <= %llu\n",
2408 (unsigned long long)superblock->logical_bytenr, 2344 superblock->logical_bytenr,
2409 superblock->dev_state->name, 2345 superblock->dev_state->name,
2410 (unsigned long long)superblock->dev_bytenr, 2346 superblock->dev_bytenr, superblock->mirror_num,
2411 superblock->mirror_num,
2412 (unsigned long long)
2413 btrfs_super_generation(super_hdr), 2347 btrfs_super_generation(super_hdr),
2414 (unsigned long long)
2415 state->max_superblock_generation); 2348 state->max_superblock_generation);
2416 } else { 2349 } else {
2417 if (state->print_mask & BTRFSIC_PRINT_MASK_SUPERBLOCK_WRITE) 2350 if (state->print_mask & BTRFSIC_PRINT_MASK_SUPERBLOCK_WRITE)
2418 printk(KERN_INFO 2351 printk(KERN_INFO
2419 "btrfsic: got new superblock @%llu (%s/%llu/%d)" 2352 "btrfsic: got new superblock @%llu (%s/%llu/%d)"
2420 " with new gen %llu > %llu\n", 2353 " with new gen %llu > %llu\n",
2421 (unsigned long long)superblock->logical_bytenr, 2354 superblock->logical_bytenr,
2422 superblock->dev_state->name, 2355 superblock->dev_state->name,
2423 (unsigned long long)superblock->dev_bytenr, 2356 superblock->dev_bytenr, superblock->mirror_num,
2424 superblock->mirror_num,
2425 (unsigned long long)
2426 btrfs_super_generation(super_hdr), 2357 btrfs_super_generation(super_hdr),
2427 (unsigned long long)
2428 state->max_superblock_generation); 2358 state->max_superblock_generation);
2429 2359
2430 state->max_superblock_generation = 2360 state->max_superblock_generation =
@@ -2455,8 +2385,7 @@ static int btrfsic_process_written_superblock(
2455 next_bytenr = btrfs_super_root(super_hdr); 2385 next_bytenr = btrfs_super_root(super_hdr);
2456 if (state->print_mask & 2386 if (state->print_mask &
2457 BTRFSIC_PRINT_MASK_ROOT_CHUNK_LOG_TREE_LOCATION) 2387 BTRFSIC_PRINT_MASK_ROOT_CHUNK_LOG_TREE_LOCATION)
2458 printk(KERN_INFO "root@%llu\n", 2388 printk(KERN_INFO "root@%llu\n", next_bytenr);
2459 (unsigned long long)next_bytenr);
2460 break; 2389 break;
2461 case 1: 2390 case 1:
2462 btrfs_set_disk_key_objectid(&tmp_disk_key, 2391 btrfs_set_disk_key_objectid(&tmp_disk_key,
@@ -2465,8 +2394,7 @@ static int btrfsic_process_written_superblock(
2465 next_bytenr = btrfs_super_chunk_root(super_hdr); 2394 next_bytenr = btrfs_super_chunk_root(super_hdr);
2466 if (state->print_mask & 2395 if (state->print_mask &
2467 BTRFSIC_PRINT_MASK_ROOT_CHUNK_LOG_TREE_LOCATION) 2396 BTRFSIC_PRINT_MASK_ROOT_CHUNK_LOG_TREE_LOCATION)
2468 printk(KERN_INFO "chunk@%llu\n", 2397 printk(KERN_INFO "chunk@%llu\n", next_bytenr);
2469 (unsigned long long)next_bytenr);
2470 break; 2398 break;
2471 case 2: 2399 case 2:
2472 btrfs_set_disk_key_objectid(&tmp_disk_key, 2400 btrfs_set_disk_key_objectid(&tmp_disk_key,
@@ -2477,8 +2405,7 @@ static int btrfsic_process_written_superblock(
2477 continue; 2405 continue;
2478 if (state->print_mask & 2406 if (state->print_mask &
2479 BTRFSIC_PRINT_MASK_ROOT_CHUNK_LOG_TREE_LOCATION) 2407 BTRFSIC_PRINT_MASK_ROOT_CHUNK_LOG_TREE_LOCATION)
2480 printk(KERN_INFO "log@%llu\n", 2408 printk(KERN_INFO "log@%llu\n", next_bytenr);
2481 (unsigned long long)next_bytenr);
2482 break; 2409 break;
2483 } 2410 }
2484 2411
@@ -2487,7 +2414,7 @@ static int btrfsic_process_written_superblock(
2487 next_bytenr, BTRFS_SUPER_INFO_SIZE); 2414 next_bytenr, BTRFS_SUPER_INFO_SIZE);
2488 if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES) 2415 if (state->print_mask & BTRFSIC_PRINT_MASK_NUM_COPIES)
2489 printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n", 2416 printk(KERN_INFO "num_copies(log_bytenr=%llu) = %d\n",
2490 (unsigned long long)next_bytenr, num_copies); 2417 next_bytenr, num_copies);
2491 for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) { 2418 for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) {
2492 int was_created; 2419 int was_created;
2493 2420
@@ -2503,8 +2430,7 @@ static int btrfsic_process_written_superblock(
2503 printk(KERN_INFO 2430 printk(KERN_INFO
2504 "btrfsic: btrfsic_map_block(@%llu," 2431 "btrfsic: btrfsic_map_block(@%llu,"
2505 " mirror=%d) failed!\n", 2432 " mirror=%d) failed!\n",
2506 (unsigned long long)next_bytenr, 2433 next_bytenr, mirror_num);
2507 mirror_num);
2508 return -1; 2434 return -1;
2509 } 2435 }
2510 2436
@@ -2589,26 +2515,22 @@ static int btrfsic_check_all_ref_blocks(struct btrfsic_state *state,
2589 " %u* refers to %c @%llu (%s/%llu/%d)\n", 2515 " %u* refers to %c @%llu (%s/%llu/%d)\n",
2590 recursion_level, 2516 recursion_level,
2591 btrfsic_get_block_type(state, block), 2517 btrfsic_get_block_type(state, block),
2592 (unsigned long long)block->logical_bytenr, 2518 block->logical_bytenr, block->dev_state->name,
2593 block->dev_state->name, 2519 block->dev_bytenr, block->mirror_num,
2594 (unsigned long long)block->dev_bytenr,
2595 block->mirror_num,
2596 l->ref_cnt, 2520 l->ref_cnt,
2597 btrfsic_get_block_type(state, l->block_ref_to), 2521 btrfsic_get_block_type(state, l->block_ref_to),
2598 (unsigned long long)
2599 l->block_ref_to->logical_bytenr, 2522 l->block_ref_to->logical_bytenr,
2600 l->block_ref_to->dev_state->name, 2523 l->block_ref_to->dev_state->name,
2601 (unsigned long long)l->block_ref_to->dev_bytenr, 2524 l->block_ref_to->dev_bytenr,
2602 l->block_ref_to->mirror_num); 2525 l->block_ref_to->mirror_num);
2603 if (l->block_ref_to->never_written) { 2526 if (l->block_ref_to->never_written) {
2604 printk(KERN_INFO "btrfs: attempt to write superblock" 2527 printk(KERN_INFO "btrfs: attempt to write superblock"
2605 " which references block %c @%llu (%s/%llu/%d)" 2528 " which references block %c @%llu (%s/%llu/%d)"
2606 " which is never written!\n", 2529 " which is never written!\n",
2607 btrfsic_get_block_type(state, l->block_ref_to), 2530 btrfsic_get_block_type(state, l->block_ref_to),
2608 (unsigned long long)
2609 l->block_ref_to->logical_bytenr, 2531 l->block_ref_to->logical_bytenr,
2610 l->block_ref_to->dev_state->name, 2532 l->block_ref_to->dev_state->name,
2611 (unsigned long long)l->block_ref_to->dev_bytenr, 2533 l->block_ref_to->dev_bytenr,
2612 l->block_ref_to->mirror_num); 2534 l->block_ref_to->mirror_num);
2613 ret = -1; 2535 ret = -1;
2614 } else if (!l->block_ref_to->is_iodone) { 2536 } else if (!l->block_ref_to->is_iodone) {
@@ -2616,10 +2538,9 @@ static int btrfsic_check_all_ref_blocks(struct btrfsic_state *state,
2616 " which references block %c @%llu (%s/%llu/%d)" 2538 " which references block %c @%llu (%s/%llu/%d)"
2617 " which is not yet iodone!\n", 2539 " which is not yet iodone!\n",
2618 btrfsic_get_block_type(state, l->block_ref_to), 2540 btrfsic_get_block_type(state, l->block_ref_to),
2619 (unsigned long long)
2620 l->block_ref_to->logical_bytenr, 2541 l->block_ref_to->logical_bytenr,
2621 l->block_ref_to->dev_state->name, 2542 l->block_ref_to->dev_state->name,
2622 (unsigned long long)l->block_ref_to->dev_bytenr, 2543 l->block_ref_to->dev_bytenr,
2623 l->block_ref_to->mirror_num); 2544 l->block_ref_to->mirror_num);
2624 ret = -1; 2545 ret = -1;
2625 } else if (l->block_ref_to->iodone_w_error) { 2546 } else if (l->block_ref_to->iodone_w_error) {
@@ -2627,10 +2548,9 @@ static int btrfsic_check_all_ref_blocks(struct btrfsic_state *state,
2627 " which references block %c @%llu (%s/%llu/%d)" 2548 " which references block %c @%llu (%s/%llu/%d)"
2628 " which has write error!\n", 2549 " which has write error!\n",
2629 btrfsic_get_block_type(state, l->block_ref_to), 2550 btrfsic_get_block_type(state, l->block_ref_to),
2630 (unsigned long long)
2631 l->block_ref_to->logical_bytenr, 2551 l->block_ref_to->logical_bytenr,
2632 l->block_ref_to->dev_state->name, 2552 l->block_ref_to->dev_state->name,
2633 (unsigned long long)l->block_ref_to->dev_bytenr, 2553 l->block_ref_to->dev_bytenr,
2634 l->block_ref_to->mirror_num); 2554 l->block_ref_to->mirror_num);
2635 ret = -1; 2555 ret = -1;
2636 } else if (l->parent_generation != 2556 } else if (l->parent_generation !=
@@ -2644,13 +2564,12 @@ static int btrfsic_check_all_ref_blocks(struct btrfsic_state *state,
2644 " with generation %llu !=" 2564 " with generation %llu !="
2645 " parent generation %llu!\n", 2565 " parent generation %llu!\n",
2646 btrfsic_get_block_type(state, l->block_ref_to), 2566 btrfsic_get_block_type(state, l->block_ref_to),
2647 (unsigned long long)
2648 l->block_ref_to->logical_bytenr, 2567 l->block_ref_to->logical_bytenr,
2649 l->block_ref_to->dev_state->name, 2568 l->block_ref_to->dev_state->name,
2650 (unsigned long long)l->block_ref_to->dev_bytenr, 2569 l->block_ref_to->dev_bytenr,
2651 l->block_ref_to->mirror_num, 2570 l->block_ref_to->mirror_num,
2652 (unsigned long long)l->block_ref_to->generation, 2571 l->block_ref_to->generation,
2653 (unsigned long long)l->parent_generation); 2572 l->parent_generation);
2654 ret = -1; 2573 ret = -1;
2655 } else if (l->block_ref_to->flush_gen > 2574 } else if (l->block_ref_to->flush_gen >
2656 l->block_ref_to->dev_state->last_flush_gen) { 2575 l->block_ref_to->dev_state->last_flush_gen) {
@@ -2660,13 +2579,10 @@ static int btrfsic_check_all_ref_blocks(struct btrfsic_state *state,
2660 " (block flush_gen=%llu," 2579 " (block flush_gen=%llu,"
2661 " dev->flush_gen=%llu)!\n", 2580 " dev->flush_gen=%llu)!\n",
2662 btrfsic_get_block_type(state, l->block_ref_to), 2581 btrfsic_get_block_type(state, l->block_ref_to),
2663 (unsigned long long)
2664 l->block_ref_to->logical_bytenr, 2582 l->block_ref_to->logical_bytenr,
2665 l->block_ref_to->dev_state->name, 2583 l->block_ref_to->dev_state->name,
2666 (unsigned long long)l->block_ref_to->dev_bytenr, 2584 l->block_ref_to->dev_bytenr,
2667 l->block_ref_to->mirror_num, 2585 l->block_ref_to->mirror_num, block->flush_gen,
2668 (unsigned long long)block->flush_gen,
2669 (unsigned long long)
2670 l->block_ref_to->dev_state->last_flush_gen); 2586 l->block_ref_to->dev_state->last_flush_gen);
2671 ret = -1; 2587 ret = -1;
2672 } else if (-1 == btrfsic_check_all_ref_blocks(state, 2588 } else if (-1 == btrfsic_check_all_ref_blocks(state,
@@ -2711,16 +2627,12 @@ static int btrfsic_is_block_ref_by_superblock(
2711 " is ref %u* from %c @%llu (%s/%llu/%d)\n", 2627 " is ref %u* from %c @%llu (%s/%llu/%d)\n",
2712 recursion_level, 2628 recursion_level,
2713 btrfsic_get_block_type(state, block), 2629 btrfsic_get_block_type(state, block),
2714 (unsigned long long)block->logical_bytenr, 2630 block->logical_bytenr, block->dev_state->name,
2715 block->dev_state->name, 2631 block->dev_bytenr, block->mirror_num,
2716 (unsigned long long)block->dev_bytenr,
2717 block->mirror_num,
2718 l->ref_cnt, 2632 l->ref_cnt,
2719 btrfsic_get_block_type(state, l->block_ref_from), 2633 btrfsic_get_block_type(state, l->block_ref_from),
2720 (unsigned long long)
2721 l->block_ref_from->logical_bytenr, 2634 l->block_ref_from->logical_bytenr,
2722 l->block_ref_from->dev_state->name, 2635 l->block_ref_from->dev_state->name,
2723 (unsigned long long)
2724 l->block_ref_from->dev_bytenr, 2636 l->block_ref_from->dev_bytenr,
2725 l->block_ref_from->mirror_num); 2637 l->block_ref_from->mirror_num);
2726 if (l->block_ref_from->is_superblock && 2638 if (l->block_ref_from->is_superblock &&
@@ -2747,14 +2659,12 @@ static void btrfsic_print_add_link(const struct btrfsic_state *state,
2747 " to %c @%llu (%s/%llu/%d).\n", 2659 " to %c @%llu (%s/%llu/%d).\n",
2748 l->ref_cnt, 2660 l->ref_cnt,
2749 btrfsic_get_block_type(state, l->block_ref_from), 2661 btrfsic_get_block_type(state, l->block_ref_from),
2750 (unsigned long long)l->block_ref_from->logical_bytenr, 2662 l->block_ref_from->logical_bytenr,
2751 l->block_ref_from->dev_state->name, 2663 l->block_ref_from->dev_state->name,
2752 (unsigned long long)l->block_ref_from->dev_bytenr, 2664 l->block_ref_from->dev_bytenr, l->block_ref_from->mirror_num,
2753 l->block_ref_from->mirror_num,
2754 btrfsic_get_block_type(state, l->block_ref_to), 2665 btrfsic_get_block_type(state, l->block_ref_to),
2755 (unsigned long long)l->block_ref_to->logical_bytenr, 2666 l->block_ref_to->logical_bytenr,
2756 l->block_ref_to->dev_state->name, 2667 l->block_ref_to->dev_state->name, l->block_ref_to->dev_bytenr,
2757 (unsigned long long)l->block_ref_to->dev_bytenr,
2758 l->block_ref_to->mirror_num); 2668 l->block_ref_to->mirror_num);
2759} 2669}
2760 2670
@@ -2766,14 +2676,12 @@ static void btrfsic_print_rem_link(const struct btrfsic_state *state,
2766 " to %c @%llu (%s/%llu/%d).\n", 2676 " to %c @%llu (%s/%llu/%d).\n",
2767 l->ref_cnt, 2677 l->ref_cnt,
2768 btrfsic_get_block_type(state, l->block_ref_from), 2678 btrfsic_get_block_type(state, l->block_ref_from),
2769 (unsigned long long)l->block_ref_from->logical_bytenr, 2679 l->block_ref_from->logical_bytenr,
2770 l->block_ref_from->dev_state->name, 2680 l->block_ref_from->dev_state->name,
2771 (unsigned long long)l->block_ref_from->dev_bytenr, 2681 l->block_ref_from->dev_bytenr, l->block_ref_from->mirror_num,
2772 l->block_ref_from->mirror_num,
2773 btrfsic_get_block_type(state, l->block_ref_to), 2682 btrfsic_get_block_type(state, l->block_ref_to),
2774 (unsigned long long)l->block_ref_to->logical_bytenr, 2683 l->block_ref_to->logical_bytenr,
2775 l->block_ref_to->dev_state->name, 2684 l->block_ref_to->dev_state->name, l->block_ref_to->dev_bytenr,
2776 (unsigned long long)l->block_ref_to->dev_bytenr,
2777 l->block_ref_to->mirror_num); 2685 l->block_ref_to->mirror_num);
2778} 2686}
2779 2687
@@ -2817,10 +2725,8 @@ static void btrfsic_dump_tree_sub(const struct btrfsic_state *state,
2817 */ 2725 */
2818 indent_add = sprintf(buf, "%c-%llu(%s/%llu/%d)", 2726 indent_add = sprintf(buf, "%c-%llu(%s/%llu/%d)",
2819 btrfsic_get_block_type(state, block), 2727 btrfsic_get_block_type(state, block),
2820 (unsigned long long)block->logical_bytenr, 2728 block->logical_bytenr, block->dev_state->name,
2821 block->dev_state->name, 2729 block->dev_bytenr, block->mirror_num);
2822 (unsigned long long)block->dev_bytenr,
2823 block->mirror_num);
2824 if (indent_level + indent_add > BTRFSIC_TREE_DUMP_MAX_INDENT_LEVEL) { 2730 if (indent_level + indent_add > BTRFSIC_TREE_DUMP_MAX_INDENT_LEVEL) {
2825 printk("[...]\n"); 2731 printk("[...]\n");
2826 return; 2732 return;
@@ -2953,10 +2859,8 @@ static struct btrfsic_block *btrfsic_block_lookup_or_add(
2953 "New %s%c-block @%llu (%s/%llu/%d)\n", 2859 "New %s%c-block @%llu (%s/%llu/%d)\n",
2954 additional_string, 2860 additional_string,
2955 btrfsic_get_block_type(state, block), 2861 btrfsic_get_block_type(state, block),
2956 (unsigned long long)block->logical_bytenr, 2862 block->logical_bytenr, dev_state->name,
2957 dev_state->name, 2863 block->dev_bytenr, mirror_num);
2958 (unsigned long long)block->dev_bytenr,
2959 mirror_num);
2960 list_add(&block->all_blocks_node, &state->all_blocks_list); 2864 list_add(&block->all_blocks_node, &state->all_blocks_list);
2961 btrfsic_block_hashtable_add(block, &state->block_hashtable); 2865 btrfsic_block_hashtable_add(block, &state->block_hashtable);
2962 if (NULL != was_created) 2866 if (NULL != was_created)
@@ -2990,7 +2894,7 @@ static void btrfsic_cmp_log_and_dev_bytenr(struct btrfsic_state *state,
2990 printk(KERN_INFO "btrfsic:" 2894 printk(KERN_INFO "btrfsic:"
2991 " btrfsic_map_block(logical @%llu," 2895 " btrfsic_map_block(logical @%llu,"
2992 " mirror %d) failed!\n", 2896 " mirror %d) failed!\n",
2993 (unsigned long long)bytenr, mirror_num); 2897 bytenr, mirror_num);
2994 continue; 2898 continue;
2995 } 2899 }
2996 2900
@@ -3007,8 +2911,7 @@ static void btrfsic_cmp_log_and_dev_bytenr(struct btrfsic_state *state,
3007 printk(KERN_INFO "btrfs: attempt to write M-block which contains logical bytenr that doesn't map to dev+physical bytenr of submit_bio," 2911 printk(KERN_INFO "btrfs: attempt to write M-block which contains logical bytenr that doesn't map to dev+physical bytenr of submit_bio,"
3008 " buffer->log_bytenr=%llu, submit_bio(bdev=%s," 2912 " buffer->log_bytenr=%llu, submit_bio(bdev=%s,"
3009 " phys_bytenr=%llu)!\n", 2913 " phys_bytenr=%llu)!\n",
3010 (unsigned long long)bytenr, dev_state->name, 2914 bytenr, dev_state->name, dev_bytenr);
3011 (unsigned long long)dev_bytenr);
3012 for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) { 2915 for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) {
3013 ret = btrfsic_map_block(state, bytenr, 2916 ret = btrfsic_map_block(state, bytenr,
3014 state->metablock_size, 2917 state->metablock_size,
@@ -3018,10 +2921,8 @@ static void btrfsic_cmp_log_and_dev_bytenr(struct btrfsic_state *state,
3018 2921
3019 printk(KERN_INFO "Read logical bytenr @%llu maps to" 2922 printk(KERN_INFO "Read logical bytenr @%llu maps to"
3020 " (%s/%llu/%d)\n", 2923 " (%s/%llu/%d)\n",
3021 (unsigned long long)bytenr, 2924 bytenr, block_ctx.dev->name,
3022 block_ctx.dev->name, 2925 block_ctx.dev_bytenr, mirror_num);
3023 (unsigned long long)block_ctx.dev_bytenr,
3024 mirror_num);
3025 } 2926 }
3026 WARN_ON(1); 2927 WARN_ON(1);
3027 } 2928 }
@@ -3060,8 +2961,7 @@ int btrfsic_submit_bh(int rw, struct buffer_head *bh)
3060 printk(KERN_INFO 2961 printk(KERN_INFO
3061 "submit_bh(rw=0x%x, blocknr=%lu (bytenr %llu)," 2962 "submit_bh(rw=0x%x, blocknr=%lu (bytenr %llu),"
3062 " size=%lu, data=%p, bdev=%p)\n", 2963 " size=%lu, data=%p, bdev=%p)\n",
3063 rw, (unsigned long)bh->b_blocknr, 2964 rw, (unsigned long)bh->b_blocknr, dev_bytenr,
3064 (unsigned long long)dev_bytenr,
3065 (unsigned long)bh->b_size, bh->b_data, 2965 (unsigned long)bh->b_size, bh->b_data,
3066 bh->b_bdev); 2966 bh->b_bdev);
3067 btrfsic_process_written_block(dev_state, dev_bytenr, 2967 btrfsic_process_written_block(dev_state, dev_bytenr,
@@ -3130,8 +3030,7 @@ void btrfsic_submit_bio(int rw, struct bio *bio)
3130 "submit_bio(rw=0x%x, bi_vcnt=%u," 3030 "submit_bio(rw=0x%x, bi_vcnt=%u,"
3131 " bi_sector=%lu (bytenr %llu), bi_bdev=%p)\n", 3031 " bi_sector=%lu (bytenr %llu), bi_bdev=%p)\n",
3132 rw, bio->bi_vcnt, (unsigned long)bio->bi_sector, 3032 rw, bio->bi_vcnt, (unsigned long)bio->bi_sector,
3133 (unsigned long long)dev_bytenr, 3033 dev_bytenr, bio->bi_bdev);
3134 bio->bi_bdev);
3135 3034
3136 mapped_datav = kmalloc(sizeof(*mapped_datav) * bio->bi_vcnt, 3035 mapped_datav = kmalloc(sizeof(*mapped_datav) * bio->bi_vcnt,
3137 GFP_NOFS); 3036 GFP_NOFS);
@@ -3379,10 +3278,8 @@ void btrfsic_unmount(struct btrfs_root *root,
3379 " @%llu (%s/%llu/%d) on umount which is" 3278 " @%llu (%s/%llu/%d) on umount which is"
3380 " not yet iodone!\n", 3279 " not yet iodone!\n",
3381 btrfsic_get_block_type(state, b_all), 3280 btrfsic_get_block_type(state, b_all),
3382 (unsigned long long)b_all->logical_bytenr, 3281 b_all->logical_bytenr, b_all->dev_state->name,
3383 b_all->dev_state->name, 3282 b_all->dev_bytenr, b_all->mirror_num);
3384 (unsigned long long)b_all->dev_bytenr,
3385 b_all->mirror_num);
3386 } 3283 }
3387 3284
3388 mutex_unlock(&btrfsic_mutex); 3285 mutex_unlock(&btrfsic_mutex);
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 37dff5b2d56d..6aad98cb343f 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -132,9 +132,8 @@ static int check_compressed_csum(struct inode *inode,
132 printk(KERN_INFO "btrfs csum failed ino %llu " 132 printk(KERN_INFO "btrfs csum failed ino %llu "
133 "extent %llu csum %u " 133 "extent %llu csum %u "
134 "wanted %u mirror %d\n", 134 "wanted %u mirror %d\n",
135 (unsigned long long)btrfs_ino(inode), 135 btrfs_ino(inode), disk_start, csum, *cb_sum,
136 (unsigned long long)disk_start, 136 cb->mirror_num);
137 csum, *cb_sum, cb->mirror_num);
138 ret = -EIO; 137 ret = -EIO;
139 goto fail; 138 goto fail;
140 } 139 }
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 09b3870c2729..1d94242ec002 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1383,14 +1383,12 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans,
1383 1383
1384 if (trans->transaction != root->fs_info->running_transaction) 1384 if (trans->transaction != root->fs_info->running_transaction)
1385 WARN(1, KERN_CRIT "trans %llu running %llu\n", 1385 WARN(1, KERN_CRIT "trans %llu running %llu\n",
1386 (unsigned long long)trans->transid, 1386 trans->transid,
1387 (unsigned long long)
1388 root->fs_info->running_transaction->transid); 1387 root->fs_info->running_transaction->transid);
1389 1388
1390 if (trans->transid != root->fs_info->generation) 1389 if (trans->transid != root->fs_info->generation)
1391 WARN(1, KERN_CRIT "trans %llu running %llu\n", 1390 WARN(1, KERN_CRIT "trans %llu running %llu\n",
1392 (unsigned long long)trans->transid, 1391 trans->transid, root->fs_info->generation);
1393 (unsigned long long)root->fs_info->generation);
1394 1392
1395 if (!should_cow_block(trans, root, buf)) { 1393 if (!should_cow_block(trans, root, buf)) {
1396 *cow_ret = buf; 1394 *cow_ret = buf;
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 685957ac208e..33dd4a5349fb 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -1474,10 +1474,8 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,
1474 printk(KERN_ERR "err add delayed dir index item(name: %s) into " 1474 printk(KERN_ERR "err add delayed dir index item(name: %s) into "
1475 "the insertion tree of the delayed node" 1475 "the insertion tree of the delayed node"
1476 "(root id: %llu, inode id: %llu, errno: %d)\n", 1476 "(root id: %llu, inode id: %llu, errno: %d)\n",
1477 name, 1477 name, delayed_node->root->objectid,
1478 (unsigned long long)delayed_node->root->objectid, 1478 delayed_node->inode_id, ret);
1479 (unsigned long long)delayed_node->inode_id,
1480 ret);
1481 BUG(); 1479 BUG();
1482 } 1480 }
1483 mutex_unlock(&delayed_node->mutex); 1481 mutex_unlock(&delayed_node->mutex);
@@ -1548,9 +1546,7 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,
1548 printk(KERN_ERR "err add delayed dir index item(index: %llu) " 1546 printk(KERN_ERR "err add delayed dir index item(index: %llu) "
1549 "into the deletion tree of the delayed node" 1547 "into the deletion tree of the delayed node"
1550 "(root id: %llu, inode id: %llu, errno: %d)\n", 1548 "(root id: %llu, inode id: %llu, errno: %d)\n",
1551 (unsigned long long)index, 1549 index, node->root->objectid, node->inode_id,
1552 (unsigned long long)node->root->objectid,
1553 (unsigned long long)node->inode_id,
1554 ret); 1550 ret);
1555 BUG(); 1551 BUG();
1556 } 1552 }
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 4253ad580e39..e34e72f3e1aa 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -148,7 +148,7 @@ no_valid_dev_replace_entry_found:
148 !btrfs_test_opt(dev_root, DEGRADED)) { 148 !btrfs_test_opt(dev_root, DEGRADED)) {
149 ret = -EIO; 149 ret = -EIO;
150 pr_warn("btrfs: cannot mount because device replace operation is ongoing and\n" "srcdev (devid %llu) is missing, need to run 'btrfs dev scan'?\n", 150 pr_warn("btrfs: cannot mount because device replace operation is ongoing and\n" "srcdev (devid %llu) is missing, need to run 'btrfs dev scan'?\n",
151 (unsigned long long)src_devid); 151 src_devid);
152 } 152 }
153 if (!dev_replace->tgtdev && 153 if (!dev_replace->tgtdev &&
154 !btrfs_test_opt(dev_root, DEGRADED)) { 154 !btrfs_test_opt(dev_root, DEGRADED)) {
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index c60372de6647..5003466b00d2 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -303,9 +303,8 @@ static int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
303 printk_ratelimited(KERN_INFO "btrfs: %s checksum verify " 303 printk_ratelimited(KERN_INFO "btrfs: %s checksum verify "
304 "failed on %llu wanted %X found %X " 304 "failed on %llu wanted %X found %X "
305 "level %d\n", 305 "level %d\n",
306 root->fs_info->sb->s_id, 306 root->fs_info->sb->s_id, buf->start,
307 (unsigned long long)buf->start, val, found, 307 val, found, btrfs_header_level(buf));
308 btrfs_header_level(buf));
309 if (result != (char *)&inline_result) 308 if (result != (char *)&inline_result)
310 kfree(result); 309 kfree(result);
311 return 1; 310 return 1;
@@ -346,9 +345,7 @@ static int verify_parent_transid(struct extent_io_tree *io_tree,
346 } 345 }
347 printk_ratelimited("parent transid verify failed on %llu wanted %llu " 346 printk_ratelimited("parent transid verify failed on %llu wanted %llu "
348 "found %llu\n", 347 "found %llu\n",
349 (unsigned long long)eb->start, 348 eb->start, parent_transid, btrfs_header_generation(eb));
350 (unsigned long long)parent_transid,
351 (unsigned long long)btrfs_header_generation(eb));
352 ret = 1; 349 ret = 1;
353 clear_extent_buffer_uptodate(eb); 350 clear_extent_buffer_uptodate(eb);
354out: 351out:
@@ -513,8 +510,7 @@ static int check_tree_block_fsid(struct btrfs_root *root,
513#define CORRUPT(reason, eb, root, slot) \ 510#define CORRUPT(reason, eb, root, slot) \
514 printk(KERN_CRIT "btrfs: corrupt leaf, %s: block=%llu," \ 511 printk(KERN_CRIT "btrfs: corrupt leaf, %s: block=%llu," \
515 "root=%llu, slot=%d\n", reason, \ 512 "root=%llu, slot=%d\n", reason, \
516 (unsigned long long)btrfs_header_bytenr(eb), \ 513 btrfs_header_bytenr(eb), root->objectid, slot)
517 (unsigned long long)root->objectid, slot)
518 514
519static noinline int check_leaf(struct btrfs_root *root, 515static noinline int check_leaf(struct btrfs_root *root,
520 struct extent_buffer *leaf) 516 struct extent_buffer *leaf)
@@ -614,14 +610,13 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio,
614 if (found_start != eb->start) { 610 if (found_start != eb->start) {
615 printk_ratelimited(KERN_INFO "btrfs bad tree block start " 611 printk_ratelimited(KERN_INFO "btrfs bad tree block start "
616 "%llu %llu\n", 612 "%llu %llu\n",
617 (unsigned long long)found_start, 613 found_start, eb->start);
618 (unsigned long long)eb->start);
619 ret = -EIO; 614 ret = -EIO;
620 goto err; 615 goto err;
621 } 616 }
622 if (check_tree_block_fsid(root, eb)) { 617 if (check_tree_block_fsid(root, eb)) {
623 printk_ratelimited(KERN_INFO "btrfs bad fsid on block %llu\n", 618 printk_ratelimited(KERN_INFO "btrfs bad fsid on block %llu\n",
624 (unsigned long long)eb->start); 619 eb->start);
625 ret = -EIO; 620 ret = -EIO;
626 goto err; 621 goto err;
627 } 622 }
@@ -2405,7 +2400,7 @@ int open_ctree(struct super_block *sb,
2405 if (features) { 2400 if (features) {
2406 printk(KERN_ERR "BTRFS: couldn't mount because of " 2401 printk(KERN_ERR "BTRFS: couldn't mount because of "
2407 "unsupported optional features (%Lx).\n", 2402 "unsupported optional features (%Lx).\n",
2408 (unsigned long long)features); 2403 features);
2409 err = -EINVAL; 2404 err = -EINVAL;
2410 goto fail_alloc; 2405 goto fail_alloc;
2411 } 2406 }
@@ -2475,7 +2470,7 @@ int open_ctree(struct super_block *sb,
2475 if (!(sb->s_flags & MS_RDONLY) && features) { 2470 if (!(sb->s_flags & MS_RDONLY) && features) {
2476 printk(KERN_ERR "BTRFS: couldn't mount RDWR because of " 2471 printk(KERN_ERR "BTRFS: couldn't mount RDWR because of "
2477 "unsupported option features (%Lx).\n", 2472 "unsupported option features (%Lx).\n",
2478 (unsigned long long)features); 2473 features);
2479 err = -EINVAL; 2474 err = -EINVAL;
2480 goto fail_alloc; 2475 goto fail_alloc;
2481 } 2476 }
@@ -3681,9 +3676,7 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf)
3681 if (transid != root->fs_info->generation) 3676 if (transid != root->fs_info->generation)
3682 WARN(1, KERN_CRIT "btrfs transid mismatch buffer %llu, " 3677 WARN(1, KERN_CRIT "btrfs transid mismatch buffer %llu, "
3683 "found %llu running %llu\n", 3678 "found %llu running %llu\n",
3684 (unsigned long long)buf->start, 3679 buf->start, transid, root->fs_info->generation);
3685 (unsigned long long)transid,
3686 (unsigned long long)root->fs_info->generation);
3687 was_dirty = set_extent_buffer_dirty(buf); 3680 was_dirty = set_extent_buffer_dirty(buf);
3688 if (!was_dirty) 3681 if (!was_dirty)
3689 __percpu_counter_add(&root->fs_info->dirty_metadata_bytes, 3682 __percpu_counter_add(&root->fs_info->dirty_metadata_bytes,
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 8cb1d41ba501..69083330ee16 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5718,7 +5718,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
5718 5718
5719 if (ret) { 5719 if (ret) {
5720 btrfs_err(info, "umm, got %d back from search, was looking for %llu", 5720 btrfs_err(info, "umm, got %d back from search, was looking for %llu",
5721 ret, (unsigned long long)bytenr); 5721 ret, bytenr);
5722 if (ret > 0) 5722 if (ret > 0)
5723 btrfs_print_leaf(extent_root, 5723 btrfs_print_leaf(extent_root,
5724 path->nodes[0]); 5724 path->nodes[0]);
@@ -5734,11 +5734,8 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
5734 WARN_ON(1); 5734 WARN_ON(1);
5735 btrfs_err(info, 5735 btrfs_err(info,
5736 "unable to find ref byte nr %llu parent %llu root %llu owner %llu offset %llu", 5736 "unable to find ref byte nr %llu parent %llu root %llu owner %llu offset %llu",
5737 (unsigned long long)bytenr, 5737 bytenr, parent, root_objectid, owner_objectid,
5738 (unsigned long long)parent, 5738 owner_offset);
5739 (unsigned long long)root_objectid,
5740 (unsigned long long)owner_objectid,
5741 (unsigned long long)owner_offset);
5742 } else { 5739 } else {
5743 btrfs_abort_transaction(trans, extent_root, ret); 5740 btrfs_abort_transaction(trans, extent_root, ret);
5744 goto out; 5741 goto out;
@@ -5767,7 +5764,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
5767 -1, 1); 5764 -1, 1);
5768 if (ret) { 5765 if (ret) {
5769 btrfs_err(info, "umm, got %d back from search, was looking for %llu", 5766 btrfs_err(info, "umm, got %d back from search, was looking for %llu",
5770 ret, (unsigned long long)bytenr); 5767 ret, bytenr);
5771 btrfs_print_leaf(extent_root, path->nodes[0]); 5768 btrfs_print_leaf(extent_root, path->nodes[0]);
5772 } 5769 }
5773 if (ret < 0) { 5770 if (ret < 0) {
@@ -6529,19 +6526,15 @@ static void dump_space_info(struct btrfs_space_info *info, u64 bytes,
6529 6526
6530 spin_lock(&info->lock); 6527 spin_lock(&info->lock);
6531 printk(KERN_INFO "space_info %llu has %llu free, is %sfull\n", 6528 printk(KERN_INFO "space_info %llu has %llu free, is %sfull\n",
6532 (unsigned long long)info->flags, 6529 info->flags,
6533 (unsigned long long)(info->total_bytes - info->bytes_used - 6530 info->total_bytes - info->bytes_used - info->bytes_pinned -
6534 info->bytes_pinned - info->bytes_reserved - 6531 info->bytes_reserved - info->bytes_readonly,
6535 info->bytes_readonly),
6536 (info->full) ? "" : "not "); 6532 (info->full) ? "" : "not ");
6537 printk(KERN_INFO "space_info total=%llu, used=%llu, pinned=%llu, " 6533 printk(KERN_INFO "space_info total=%llu, used=%llu, pinned=%llu, "
6538 "reserved=%llu, may_use=%llu, readonly=%llu\n", 6534 "reserved=%llu, may_use=%llu, readonly=%llu\n",
6539 (unsigned long long)info->total_bytes, 6535 info->total_bytes, info->bytes_used, info->bytes_pinned,
6540 (unsigned long long)info->bytes_used, 6536 info->bytes_reserved, info->bytes_may_use,
6541 (unsigned long long)info->bytes_pinned, 6537 info->bytes_readonly);
6542 (unsigned long long)info->bytes_reserved,
6543 (unsigned long long)info->bytes_may_use,
6544 (unsigned long long)info->bytes_readonly);
6545 spin_unlock(&info->lock); 6538 spin_unlock(&info->lock);
6546 6539
6547 if (!dump_block_groups) 6540 if (!dump_block_groups)
@@ -6552,12 +6545,9 @@ again:
6552 list_for_each_entry(cache, &info->block_groups[index], list) { 6545 list_for_each_entry(cache, &info->block_groups[index], list) {
6553 spin_lock(&cache->lock); 6546 spin_lock(&cache->lock);
6554 printk(KERN_INFO "block group %llu has %llu bytes, %llu used %llu pinned %llu reserved %s\n", 6547 printk(KERN_INFO "block group %llu has %llu bytes, %llu used %llu pinned %llu reserved %s\n",
6555 (unsigned long long)cache->key.objectid, 6548 cache->key.objectid, cache->key.offset,
6556 (unsigned long long)cache->key.offset, 6549 btrfs_block_group_used(&cache->item), cache->pinned,
6557 (unsigned long long)btrfs_block_group_used(&cache->item), 6550 cache->reserved, cache->ro ? "[readonly]" : "");
6558 (unsigned long long)cache->pinned,
6559 (unsigned long long)cache->reserved,
6560 cache->ro ? "[readonly]" : "");
6561 btrfs_dump_free_space(cache, bytes); 6551 btrfs_dump_free_space(cache, bytes);
6562 spin_unlock(&cache->lock); 6552 spin_unlock(&cache->lock);
6563 } 6553 }
@@ -6594,8 +6584,7 @@ again:
6594 6584
6595 sinfo = __find_space_info(root->fs_info, flags); 6585 sinfo = __find_space_info(root->fs_info, flags);
6596 btrfs_err(root->fs_info, "allocation failed flags %llu, wanted %llu", 6586 btrfs_err(root->fs_info, "allocation failed flags %llu, wanted %llu",
6597 (unsigned long long)flags, 6587 flags, num_bytes);
6598 (unsigned long long)num_bytes);
6599 if (sinfo) 6588 if (sinfo)
6600 dump_space_info(sinfo, num_bytes, 1); 6589 dump_space_info(sinfo, num_bytes, 1);
6601 } 6590 }
@@ -6615,7 +6604,7 @@ static int __btrfs_free_reserved_extent(struct btrfs_root *root,
6615 cache = btrfs_lookup_block_group(root->fs_info, start); 6604 cache = btrfs_lookup_block_group(root->fs_info, start);
6616 if (!cache) { 6605 if (!cache) {
6617 btrfs_err(root->fs_info, "Unable to find block group for %llu", 6606 btrfs_err(root->fs_info, "Unable to find block group for %llu",
6618 (unsigned long long)start); 6607 start);
6619 return -ENOSPC; 6608 return -ENOSPC;
6620 } 6609 }
6621 6610
@@ -6711,8 +6700,7 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans,
6711 ret = update_block_group(root, ins->objectid, ins->offset, 1); 6700 ret = update_block_group(root, ins->objectid, ins->offset, 1);
6712 if (ret) { /* -ENOENT, logic error */ 6701 if (ret) { /* -ENOENT, logic error */
6713 btrfs_err(fs_info, "update block group failed for %llu %llu", 6702 btrfs_err(fs_info, "update block group failed for %llu %llu",
6714 (unsigned long long)ins->objectid, 6703 ins->objectid, ins->offset);
6715 (unsigned long long)ins->offset);
6716 BUG(); 6704 BUG();
6717 } 6705 }
6718 return ret; 6706 return ret;
@@ -6784,8 +6772,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
6784 ret = update_block_group(root, ins->objectid, root->leafsize, 1); 6772 ret = update_block_group(root, ins->objectid, root->leafsize, 1);
6785 if (ret) { /* -ENOENT, logic error */ 6773 if (ret) { /* -ENOENT, logic error */
6786 btrfs_err(fs_info, "update block group failed for %llu %llu", 6774 btrfs_err(fs_info, "update block group failed for %llu %llu",
6787 (unsigned long long)ins->objectid, 6775 ins->objectid, ins->offset);
6788 (unsigned long long)ins->offset);
6789 BUG(); 6776 BUG();
6790 } 6777 }
6791 return ret; 6778 return ret;
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
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index f87d09a0dfaa..4f53159bdb9d 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -248,9 +248,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
248 } else { 248 } else {
249 printk(KERN_INFO "btrfs no csum found " 249 printk(KERN_INFO "btrfs no csum found "
250 "for inode %llu start %llu\n", 250 "for inode %llu start %llu\n",
251 (unsigned long long) 251 btrfs_ino(inode), offset);
252 btrfs_ino(inode),
253 (unsigned long long)offset);
254 } 252 }
255 item = NULL; 253 item = NULL;
256 btrfs_release_path(path); 254 btrfs_release_path(path);
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index 34ecc651c9ab..23182648976b 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -673,8 +673,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
673 btrfs_err(root->fs_info, 673 btrfs_err(root->fs_info,
674 "free space inode generation (%llu) " 674 "free space inode generation (%llu) "
675 "did not match free space cache generation (%llu)", 675 "did not match free space cache generation (%llu)",
676 (unsigned long long)BTRFS_I(inode)->generation, 676 BTRFS_I(inode)->generation, generation);
677 (unsigned long long)generation);
678 return 0; 677 return 0;
679 } 678 }
680 679
@@ -1991,8 +1990,7 @@ void btrfs_dump_free_space(struct btrfs_block_group_cache *block_group,
1991 if (info->bytes >= bytes && !block_group->ro) 1990 if (info->bytes >= bytes && !block_group->ro)
1992 count++; 1991 count++;
1993 printk(KERN_CRIT "entry offset %llu, bytes %llu, bitmap %s\n", 1992 printk(KERN_CRIT "entry offset %llu, bytes %llu, bitmap %s\n",
1994 (unsigned long long)info->offset, 1993 info->offset, info->bytes,
1995 (unsigned long long)info->bytes,
1996 (info->bitmap) ? "yes" : "no"); 1994 (info->bitmap) ? "yes" : "no");
1997 } 1995 }
1998 printk(KERN_INFO "block group has cluster?: %s\n", 1996 printk(KERN_INFO "block group has cluster?: %s\n",
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 264feefa0290..21d8674f7837 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2786,8 +2786,7 @@ good:
2786zeroit: 2786zeroit:
2787 if (__ratelimit(&_rs)) 2787 if (__ratelimit(&_rs))
2788 btrfs_info(root->fs_info, "csum failed ino %llu off %llu csum %u expected csum %u", 2788 btrfs_info(root->fs_info, "csum failed ino %llu off %llu csum %u expected csum %u",
2789 (unsigned long long)btrfs_ino(page->mapping->host), 2789 btrfs_ino(page->mapping->host), start, csum, csum_expected);
2790 (unsigned long long)start, csum, csum_expected);
2791 memset(kaddr + offset, 1, end - start + 1); 2790 memset(kaddr + offset, 1, end - start + 1);
2792 flush_dcache_page(page); 2791 flush_dcache_page(page);
2793 kunmap_atomic(kaddr); 2792 kunmap_atomic(kaddr);
@@ -3572,8 +3571,7 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans,
3572 if (ret) { 3571 if (ret) {
3573 btrfs_info(root->fs_info, 3572 btrfs_info(root->fs_info,
3574 "failed to delete reference to %.*s, inode %llu parent %llu", 3573 "failed to delete reference to %.*s, inode %llu parent %llu",
3575 name_len, name, 3574 name_len, name, ino, dir_ino);
3576 (unsigned long long)ino, (unsigned long long)dir_ino);
3577 btrfs_abort_transaction(trans, root, ret); 3575 btrfs_abort_transaction(trans, root, ret);
3578 goto err; 3576 goto err;
3579 } 3577 }
@@ -6081,10 +6079,7 @@ insert:
6081 btrfs_release_path(path); 6079 btrfs_release_path(path);
6082 if (em->start > start || extent_map_end(em) <= start) { 6080 if (em->start > start || extent_map_end(em) <= start) {
6083 btrfs_err(root->fs_info, "bad extent! em: [%llu %llu] passed [%llu %llu]", 6081 btrfs_err(root->fs_info, "bad extent! em: [%llu %llu] passed [%llu %llu]",
6084 (unsigned long long)em->start, 6082 em->start, em->len, start, len);
6085 (unsigned long long)em->len,
6086 (unsigned long long)start,
6087 (unsigned long long)len);
6088 err = -EIO; 6083 err = -EIO;
6089 goto out; 6084 goto out;
6090 } 6085 }
@@ -6753,9 +6748,8 @@ static void btrfs_endio_direct_read(struct bio *bio, int err)
6753 flush_dcache_page(bvec->bv_page); 6748 flush_dcache_page(bvec->bv_page);
6754 if (csum != csums[index]) { 6749 if (csum != csums[index]) {
6755 btrfs_err(root->fs_info, "csum failed ino %llu off %llu csum %u expected csum %u", 6750 btrfs_err(root->fs_info, "csum failed ino %llu off %llu csum %u expected csum %u",
6756 (unsigned long long)btrfs_ino(inode), 6751 btrfs_ino(inode), start, csum,
6757 (unsigned long long)start, 6752 csums[index]);
6758 csum, csums[index]);
6759 err = -EIO; 6753 err = -EIO;
6760 } 6754 }
6761 } 6755 }
@@ -6843,7 +6837,7 @@ static void btrfs_end_dio_bio(struct bio *bio, int err)
6843 if (err) { 6837 if (err) {
6844 printk(KERN_ERR "btrfs direct IO failed ino %llu rw %lu " 6838 printk(KERN_ERR "btrfs direct IO failed ino %llu rw %lu "
6845 "sector %#Lx len %u err no %d\n", 6839 "sector %#Lx len %u err no %d\n",
6846 (unsigned long long)btrfs_ino(dip->inode), bio->bi_rw, 6840 btrfs_ino(dip->inode), bio->bi_rw,
6847 (unsigned long long)bio->bi_sector, bio->bi_size, err); 6841 (unsigned long long)bio->bi_sector, bio->bi_size, err);
6848 dip->errors = 1; 6842 dip->errors = 1;
6849 6843
@@ -7775,7 +7769,7 @@ void btrfs_destroy_inode(struct inode *inode)
7775 if (test_bit(BTRFS_INODE_HAS_ORPHAN_ITEM, 7769 if (test_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
7776 &BTRFS_I(inode)->runtime_flags)) { 7770 &BTRFS_I(inode)->runtime_flags)) {
7777 btrfs_info(root->fs_info, "inode %llu still on the orphan list", 7771 btrfs_info(root->fs_info, "inode %llu still on the orphan list",
7778 (unsigned long long)btrfs_ino(inode)); 7772 btrfs_ino(inode));
7779 atomic_dec(&root->orphan_inodes); 7773 atomic_dec(&root->orphan_inodes);
7780 } 7774 }
7781 7775
@@ -7785,8 +7779,7 @@ void btrfs_destroy_inode(struct inode *inode)
7785 break; 7779 break;
7786 else { 7780 else {
7787 btrfs_err(root->fs_info, "found ordered extent %llu %llu on inode cleanup", 7781 btrfs_err(root->fs_info, "found ordered extent %llu %llu on inode cleanup",
7788 (unsigned long long)ordered->file_offset, 7782 ordered->file_offset, ordered->len);
7789 (unsigned long long)ordered->len);
7790 btrfs_remove_ordered_extent(inode, ordered); 7783 btrfs_remove_ordered_extent(inode, ordered);
7791 btrfs_put_ordered_extent(ordered); 7784 btrfs_put_ordered_extent(ordered);
7792 btrfs_put_ordered_extent(ordered); 7785 btrfs_put_ordered_extent(ordered);
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 559cb161a60a..996951a8d28d 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1421,14 +1421,13 @@ static noinline int btrfs_ioctl_resize(struct file *file,
1421 ret = -EINVAL; 1421 ret = -EINVAL;
1422 goto out_free; 1422 goto out_free;
1423 } 1423 }
1424 printk(KERN_INFO "btrfs: resizing devid %llu\n", 1424 printk(KERN_INFO "btrfs: resizing devid %llu\n", devid);
1425 (unsigned long long)devid);
1426 } 1425 }
1427 1426
1428 device = btrfs_find_device(root->fs_info, devid, NULL, NULL); 1427 device = btrfs_find_device(root->fs_info, devid, NULL, NULL);
1429 if (!device) { 1428 if (!device) {
1430 printk(KERN_INFO "btrfs: resizer unable to find device %llu\n", 1429 printk(KERN_INFO "btrfs: resizer unable to find device %llu\n",
1431 (unsigned long long)devid); 1430 devid);
1432 ret = -ENODEV; 1431 ret = -ENODEV;
1433 goto out_free; 1432 goto out_free;
1434 } 1433 }
@@ -1436,7 +1435,7 @@ static noinline int btrfs_ioctl_resize(struct file *file,
1436 if (!device->writeable) { 1435 if (!device->writeable) {
1437 printk(KERN_INFO "btrfs: resizer unable to apply on " 1436 printk(KERN_INFO "btrfs: resizer unable to apply on "
1438 "readonly device %llu\n", 1437 "readonly device %llu\n",
1439 (unsigned long long)devid); 1438 devid);
1440 ret = -EPERM; 1439 ret = -EPERM;
1441 goto out_free; 1440 goto out_free;
1442 } 1441 }
@@ -1488,8 +1487,7 @@ static noinline int btrfs_ioctl_resize(struct file *file,
1488 new_size *= root->sectorsize; 1487 new_size *= root->sectorsize;
1489 1488
1490 printk_in_rcu(KERN_INFO "btrfs: new size for %s is %llu\n", 1489 printk_in_rcu(KERN_INFO "btrfs: new size for %s is %llu\n",
1491 rcu_str_deref(device->name), 1490 rcu_str_deref(device->name), new_size);
1492 (unsigned long long)new_size);
1493 1491
1494 if (new_size > old_size) { 1492 if (new_size > old_size) {
1495 trans = btrfs_start_transaction(root, 0); 1493 trans = btrfs_start_transaction(root, 0);
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index b52b2c4010c2..f2023ccb7cf6 100644
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -67,7 +67,7 @@ static void ordered_data_tree_panic(struct inode *inode, int errno,
67{ 67{
68 struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); 68 struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
69 btrfs_panic(fs_info, errno, "Inconsistency in ordered tree at offset " 69 btrfs_panic(fs_info, errno, "Inconsistency in ordered tree at offset "
70 "%llu\n", (unsigned long long)offset); 70 "%llu\n", offset);
71} 71}
72 72
73/* 73/*
@@ -336,14 +336,12 @@ int btrfs_dec_test_first_ordered_pending(struct inode *inode,
336 *file_offset = dec_end; 336 *file_offset = dec_end;
337 if (dec_start > dec_end) { 337 if (dec_start > dec_end) {
338 printk(KERN_CRIT "bad ordering dec_start %llu end %llu\n", 338 printk(KERN_CRIT "bad ordering dec_start %llu end %llu\n",
339 (unsigned long long)dec_start, 339 dec_start, dec_end);
340 (unsigned long long)dec_end);
341 } 340 }
342 to_dec = dec_end - dec_start; 341 to_dec = dec_end - dec_start;
343 if (to_dec > entry->bytes_left) { 342 if (to_dec > entry->bytes_left) {
344 printk(KERN_CRIT "bad ordered accounting left %llu size %llu\n", 343 printk(KERN_CRIT "bad ordered accounting left %llu size %llu\n",
345 (unsigned long long)entry->bytes_left, 344 entry->bytes_left, to_dec);
346 (unsigned long long)to_dec);
347 } 345 }
348 entry->bytes_left -= to_dec; 346 entry->bytes_left -= to_dec;
349 if (!uptodate) 347 if (!uptodate)
@@ -403,8 +401,7 @@ have_entry:
403 401
404 if (io_size > entry->bytes_left) { 402 if (io_size > entry->bytes_left) {
405 printk(KERN_CRIT "bad ordered accounting left %llu size %llu\n", 403 printk(KERN_CRIT "bad ordered accounting left %llu size %llu\n",
406 (unsigned long long)entry->bytes_left, 404 entry->bytes_left, io_size);
407 (unsigned long long)io_size);
408 } 405 }
409 entry->bytes_left -= io_size; 406 entry->bytes_left -= io_size;
410 if (!uptodate) 407 if (!uptodate)
diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index 32022f3f169b..0088bedc8631 100644
--- a/fs/btrfs/print-tree.c
+++ b/fs/btrfs/print-tree.c
@@ -26,14 +26,12 @@ static void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk)
26 int i; 26 int i;
27 printk(KERN_INFO "\t\tchunk length %llu owner %llu type %llu " 27 printk(KERN_INFO "\t\tchunk length %llu owner %llu type %llu "
28 "num_stripes %d\n", 28 "num_stripes %d\n",
29 (unsigned long long)btrfs_chunk_length(eb, chunk), 29 btrfs_chunk_length(eb, chunk), btrfs_chunk_owner(eb, chunk),
30 (unsigned long long)btrfs_chunk_owner(eb, chunk), 30 btrfs_chunk_type(eb, chunk), num_stripes);
31 (unsigned long long)btrfs_chunk_type(eb, chunk),
32 num_stripes);
33 for (i = 0 ; i < num_stripes ; i++) { 31 for (i = 0 ; i < num_stripes ; i++) {
34 printk(KERN_INFO "\t\t\tstripe %d devid %llu offset %llu\n", i, 32 printk(KERN_INFO "\t\t\tstripe %d devid %llu offset %llu\n", i,
35 (unsigned long long)btrfs_stripe_devid_nr(eb, chunk, i), 33 btrfs_stripe_devid_nr(eb, chunk, i),
36 (unsigned long long)btrfs_stripe_offset_nr(eb, chunk, i)); 34 btrfs_stripe_offset_nr(eb, chunk, i));
37 } 35 }
38} 36}
39static void print_dev_item(struct extent_buffer *eb, 37static void print_dev_item(struct extent_buffer *eb,
@@ -41,18 +39,18 @@ static void print_dev_item(struct extent_buffer *eb,
41{ 39{
42 printk(KERN_INFO "\t\tdev item devid %llu " 40 printk(KERN_INFO "\t\tdev item devid %llu "
43 "total_bytes %llu bytes used %llu\n", 41 "total_bytes %llu bytes used %llu\n",
44 (unsigned long long)btrfs_device_id(eb, dev_item), 42 btrfs_device_id(eb, dev_item),
45 (unsigned long long)btrfs_device_total_bytes(eb, dev_item), 43 btrfs_device_total_bytes(eb, dev_item),
46 (unsigned long long)btrfs_device_bytes_used(eb, dev_item)); 44 btrfs_device_bytes_used(eb, dev_item));
47} 45}
48static void print_extent_data_ref(struct extent_buffer *eb, 46static void print_extent_data_ref(struct extent_buffer *eb,
49 struct btrfs_extent_data_ref *ref) 47 struct btrfs_extent_data_ref *ref)
50{ 48{
51 printk(KERN_INFO "\t\textent data backref root %llu " 49 printk(KERN_INFO "\t\textent data backref root %llu "
52 "objectid %llu offset %llu count %u\n", 50 "objectid %llu offset %llu count %u\n",
53 (unsigned long long)btrfs_extent_data_ref_root(eb, ref), 51 btrfs_extent_data_ref_root(eb, ref),
54 (unsigned long long)btrfs_extent_data_ref_objectid(eb, ref), 52 btrfs_extent_data_ref_objectid(eb, ref),
55 (unsigned long long)btrfs_extent_data_ref_offset(eb, ref), 53 btrfs_extent_data_ref_offset(eb, ref),
56 btrfs_extent_data_ref_count(eb, ref)); 54 btrfs_extent_data_ref_count(eb, ref));
57} 55}
58 56
@@ -87,9 +85,8 @@ static void print_extent_item(struct extent_buffer *eb, int slot)
87 flags = btrfs_extent_flags(eb, ei); 85 flags = btrfs_extent_flags(eb, ei);
88 86
89 printk(KERN_INFO "\t\textent refs %llu gen %llu flags %llu\n", 87 printk(KERN_INFO "\t\textent refs %llu gen %llu flags %llu\n",
90 (unsigned long long)btrfs_extent_refs(eb, ei), 88 btrfs_extent_refs(eb, ei), btrfs_extent_generation(eb, ei),
91 (unsigned long long)btrfs_extent_generation(eb, ei), 89 flags);
92 (unsigned long long)flags);
93 90
94 if (flags & BTRFS_EXTENT_FLAG_TREE_BLOCK) { 91 if (flags & BTRFS_EXTENT_FLAG_TREE_BLOCK) {
95 struct btrfs_tree_block_info *info; 92 struct btrfs_tree_block_info *info;
@@ -97,9 +94,8 @@ static void print_extent_item(struct extent_buffer *eb, int slot)
97 btrfs_tree_block_key(eb, info, &key); 94 btrfs_tree_block_key(eb, info, &key);
98 printk(KERN_INFO "\t\ttree block key (%llu %u %llu) " 95 printk(KERN_INFO "\t\ttree block key (%llu %u %llu) "
99 "level %d\n", 96 "level %d\n",
100 (unsigned long long)btrfs_disk_key_objectid(&key), 97 btrfs_disk_key_objectid(&key), key.type,
101 key.type, 98 btrfs_disk_key_offset(&key),
102 (unsigned long long)btrfs_disk_key_offset(&key),
103 btrfs_tree_block_level(eb, info)); 99 btrfs_tree_block_level(eb, info));
104 iref = (struct btrfs_extent_inline_ref *)(info + 1); 100 iref = (struct btrfs_extent_inline_ref *)(info + 1);
105 } else { 101 } else {
@@ -115,11 +111,11 @@ static void print_extent_item(struct extent_buffer *eb, int slot)
115 switch (type) { 111 switch (type) {
116 case BTRFS_TREE_BLOCK_REF_KEY: 112 case BTRFS_TREE_BLOCK_REF_KEY:
117 printk(KERN_INFO "\t\ttree block backref " 113 printk(KERN_INFO "\t\ttree block backref "
118 "root %llu\n", (unsigned long long)offset); 114 "root %llu\n", offset);
119 break; 115 break;
120 case BTRFS_SHARED_BLOCK_REF_KEY: 116 case BTRFS_SHARED_BLOCK_REF_KEY:
121 printk(KERN_INFO "\t\tshared block backref " 117 printk(KERN_INFO "\t\tshared block backref "
122 "parent %llu\n", (unsigned long long)offset); 118 "parent %llu\n", offset);
123 break; 119 break;
124 case BTRFS_EXTENT_DATA_REF_KEY: 120 case BTRFS_EXTENT_DATA_REF_KEY:
125 dref = (struct btrfs_extent_data_ref *)(&iref->offset); 121 dref = (struct btrfs_extent_data_ref *)(&iref->offset);
@@ -129,8 +125,7 @@ static void print_extent_item(struct extent_buffer *eb, int slot)
129 sref = (struct btrfs_shared_data_ref *)(iref + 1); 125 sref = (struct btrfs_shared_data_ref *)(iref + 1);
130 printk(KERN_INFO "\t\tshared data backref " 126 printk(KERN_INFO "\t\tshared data backref "
131 "parent %llu count %u\n", 127 "parent %llu count %u\n",
132 (unsigned long long)offset, 128 offset, btrfs_shared_data_ref_count(eb, sref));
133 btrfs_shared_data_ref_count(eb, sref));
134 break; 129 break;
135 default: 130 default:
136 BUG(); 131 BUG();
@@ -148,9 +143,9 @@ static void print_extent_ref_v0(struct extent_buffer *eb, int slot)
148 ref0 = btrfs_item_ptr(eb, slot, struct btrfs_extent_ref_v0); 143 ref0 = btrfs_item_ptr(eb, slot, struct btrfs_extent_ref_v0);
149 printk("\t\textent back ref root %llu gen %llu " 144 printk("\t\textent back ref root %llu gen %llu "
150 "owner %llu num_refs %lu\n", 145 "owner %llu num_refs %lu\n",
151 (unsigned long long)btrfs_ref_root_v0(eb, ref0), 146 btrfs_ref_root_v0(eb, ref0),
152 (unsigned long long)btrfs_ref_generation_v0(eb, ref0), 147 btrfs_ref_generation_v0(eb, ref0),
153 (unsigned long long)btrfs_ref_objectid_v0(eb, ref0), 148 btrfs_ref_objectid_v0(eb, ref0),
154 (unsigned long)btrfs_ref_count_v0(eb, ref0)); 149 (unsigned long)btrfs_ref_count_v0(eb, ref0));
155} 150}
156#endif 151#endif
@@ -196,39 +191,34 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
196 nr = btrfs_header_nritems(l); 191 nr = btrfs_header_nritems(l);
197 192
198 btrfs_info(root->fs_info, "leaf %llu total ptrs %d free space %d", 193 btrfs_info(root->fs_info, "leaf %llu total ptrs %d free space %d",
199 (unsigned long long)btrfs_header_bytenr(l), nr, 194 btrfs_header_bytenr(l), nr, btrfs_leaf_free_space(root, l));
200 btrfs_leaf_free_space(root, l));
201 for (i = 0 ; i < nr ; i++) { 195 for (i = 0 ; i < nr ; i++) {
202 item = btrfs_item_nr(l, i); 196 item = btrfs_item_nr(l, i);
203 btrfs_item_key_to_cpu(l, &key, i); 197 btrfs_item_key_to_cpu(l, &key, i);
204 type = btrfs_key_type(&key); 198 type = btrfs_key_type(&key);
205 printk(KERN_INFO "\titem %d key (%llu %u %llu) itemoff %d " 199 printk(KERN_INFO "\titem %d key (%llu %u %llu) itemoff %d "
206 "itemsize %d\n", 200 "itemsize %d\n",
207 i, 201 i, key.objectid, type, key.offset,
208 (unsigned long long)key.objectid, type,
209 (unsigned long long)key.offset,
210 btrfs_item_offset(l, item), btrfs_item_size(l, item)); 202 btrfs_item_offset(l, item), btrfs_item_size(l, item));
211 switch (type) { 203 switch (type) {
212 case BTRFS_INODE_ITEM_KEY: 204 case BTRFS_INODE_ITEM_KEY:
213 ii = btrfs_item_ptr(l, i, struct btrfs_inode_item); 205 ii = btrfs_item_ptr(l, i, struct btrfs_inode_item);
214 printk(KERN_INFO "\t\tinode generation %llu size %llu " 206 printk(KERN_INFO "\t\tinode generation %llu size %llu "
215 "mode %o\n", 207 "mode %o\n",
216 (unsigned long long)
217 btrfs_inode_generation(l, ii), 208 btrfs_inode_generation(l, ii),
218 (unsigned long long)btrfs_inode_size(l, ii), 209 btrfs_inode_size(l, ii),
219 btrfs_inode_mode(l, ii)); 210 btrfs_inode_mode(l, ii));
220 break; 211 break;
221 case BTRFS_DIR_ITEM_KEY: 212 case BTRFS_DIR_ITEM_KEY:
222 di = btrfs_item_ptr(l, i, struct btrfs_dir_item); 213 di = btrfs_item_ptr(l, i, struct btrfs_dir_item);
223 btrfs_dir_item_key_to_cpu(l, di, &found_key); 214 btrfs_dir_item_key_to_cpu(l, di, &found_key);
224 printk(KERN_INFO "\t\tdir oid %llu type %u\n", 215 printk(KERN_INFO "\t\tdir oid %llu type %u\n",
225 (unsigned long long)found_key.objectid, 216 found_key.objectid,
226 btrfs_dir_type(l, di)); 217 btrfs_dir_type(l, di));
227 break; 218 break;
228 case BTRFS_ROOT_ITEM_KEY: 219 case BTRFS_ROOT_ITEM_KEY:
229 ri = btrfs_item_ptr(l, i, struct btrfs_root_item); 220 ri = btrfs_item_ptr(l, i, struct btrfs_root_item);
230 printk(KERN_INFO "\t\troot data bytenr %llu refs %u\n", 221 printk(KERN_INFO "\t\troot data bytenr %llu refs %u\n",
231 (unsigned long long)
232 btrfs_disk_root_bytenr(l, ri), 222 btrfs_disk_root_bytenr(l, ri),
233 btrfs_disk_root_refs(l, ri)); 223 btrfs_disk_root_refs(l, ri));
234 break; 224 break;
@@ -264,17 +254,12 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
264 } 254 }
265 printk(KERN_INFO "\t\textent data disk bytenr %llu " 255 printk(KERN_INFO "\t\textent data disk bytenr %llu "
266 "nr %llu\n", 256 "nr %llu\n",
267 (unsigned long long)
268 btrfs_file_extent_disk_bytenr(l, fi), 257 btrfs_file_extent_disk_bytenr(l, fi),
269 (unsigned long long)
270 btrfs_file_extent_disk_num_bytes(l, fi)); 258 btrfs_file_extent_disk_num_bytes(l, fi));
271 printk(KERN_INFO "\t\textent data offset %llu " 259 printk(KERN_INFO "\t\textent data offset %llu "
272 "nr %llu ram %llu\n", 260 "nr %llu ram %llu\n",
273 (unsigned long long)
274 btrfs_file_extent_offset(l, fi), 261 btrfs_file_extent_offset(l, fi),
275 (unsigned long long)
276 btrfs_file_extent_num_bytes(l, fi), 262 btrfs_file_extent_num_bytes(l, fi),
277 (unsigned long long)
278 btrfs_file_extent_ram_bytes(l, fi)); 263 btrfs_file_extent_ram_bytes(l, fi));
279 break; 264 break;
280 case BTRFS_EXTENT_REF_V0_KEY: 265 case BTRFS_EXTENT_REF_V0_KEY:
@@ -288,7 +273,6 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
288 bi = btrfs_item_ptr(l, i, 273 bi = btrfs_item_ptr(l, i,
289 struct btrfs_block_group_item); 274 struct btrfs_block_group_item);
290 printk(KERN_INFO "\t\tblock group used %llu\n", 275 printk(KERN_INFO "\t\tblock group used %llu\n",
291 (unsigned long long)
292 btrfs_disk_block_group_used(l, bi)); 276 btrfs_disk_block_group_used(l, bi));
293 break; 277 break;
294 case BTRFS_CHUNK_ITEM_KEY: 278 case BTRFS_CHUNK_ITEM_KEY:
@@ -305,13 +289,9 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
305 printk(KERN_INFO "\t\tdev extent chunk_tree %llu\n" 289 printk(KERN_INFO "\t\tdev extent chunk_tree %llu\n"
306 "\t\tchunk objectid %llu chunk offset %llu " 290 "\t\tchunk objectid %llu chunk offset %llu "
307 "length %llu\n", 291 "length %llu\n",
308 (unsigned long long)
309 btrfs_dev_extent_chunk_tree(l, dev_extent), 292 btrfs_dev_extent_chunk_tree(l, dev_extent),
310 (unsigned long long)
311 btrfs_dev_extent_chunk_objectid(l, dev_extent), 293 btrfs_dev_extent_chunk_objectid(l, dev_extent),
312 (unsigned long long)
313 btrfs_dev_extent_chunk_offset(l, dev_extent), 294 btrfs_dev_extent_chunk_offset(l, dev_extent),
314 (unsigned long long)
315 btrfs_dev_extent_length(l, dev_extent)); 295 btrfs_dev_extent_length(l, dev_extent));
316 break; 296 break;
317 case BTRFS_DEV_STATS_KEY: 297 case BTRFS_DEV_STATS_KEY:
@@ -344,16 +324,13 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *c)
344 return; 324 return;
345 } 325 }
346 btrfs_info(root->fs_info, "node %llu level %d total ptrs %d free spc %u", 326 btrfs_info(root->fs_info, "node %llu level %d total ptrs %d free spc %u",
347 (unsigned long long)btrfs_header_bytenr(c), 327 btrfs_header_bytenr(c), level, nr,
348 level, nr, (u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr); 328 (u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr);
349 for (i = 0; i < nr; i++) { 329 for (i = 0; i < nr; i++) {
350 btrfs_node_key_to_cpu(c, &key, i); 330 btrfs_node_key_to_cpu(c, &key, i);
351 printk(KERN_INFO "\tkey %d (%llu %u %llu) block %llu\n", 331 printk(KERN_INFO "\tkey %d (%llu %u %llu) block %llu\n",
352 i, 332 i, key.objectid, key.type, key.offset,
353 (unsigned long long)key.objectid, 333 btrfs_node_blockptr(c, i));
354 key.type,
355 (unsigned long long)key.offset,
356 (unsigned long long)btrfs_node_blockptr(c, i));
357 } 334 }
358 for (i = 0; i < nr; i++) { 335 for (i = 0; i < nr; i++) {
359 struct extent_buffer *next = read_tree_block(root, 336 struct extent_buffer *next = read_tree_block(root,
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 66c58e120b2c..4e6ef490619e 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -398,8 +398,7 @@ next1:
398 if (ret == -ENOENT) { 398 if (ret == -ENOENT) {
399 printk(KERN_WARNING 399 printk(KERN_WARNING
400 "btrfs: orphan qgroup relation 0x%llx->0x%llx\n", 400 "btrfs: orphan qgroup relation 0x%llx->0x%llx\n",
401 (unsigned long long)found_key.objectid, 401 found_key.objectid, found_key.offset);
402 (unsigned long long)found_key.offset);
403 ret = 0; /* ignore the error */ 402 ret = 0; /* ignore the error */
404 } 403 }
405 if (ret) 404 if (ret)
@@ -1163,7 +1162,7 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans,
1163 if (ret) { 1162 if (ret) {
1164 fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; 1163 fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT;
1165 printk(KERN_INFO "unable to update quota limit for %llu\n", 1164 printk(KERN_INFO "unable to update quota limit for %llu\n",
1166 (unsigned long long)qgroupid); 1165 qgroupid);
1167 } 1166 }
1168 1167
1169 spin_lock(&fs_info->qgroup_lock); 1168 spin_lock(&fs_info->qgroup_lock);
@@ -1873,10 +1872,9 @@ qgroup_rescan_leaf(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
1873 path, 1, 0); 1872 path, 1, 0);
1874 1873
1875 pr_debug("current progress key (%llu %u %llu), search_slot ret %d\n", 1874 pr_debug("current progress key (%llu %u %llu), search_slot ret %d\n",
1876 (unsigned long long)fs_info->qgroup_rescan_progress.objectid, 1875 fs_info->qgroup_rescan_progress.objectid,
1877 fs_info->qgroup_rescan_progress.type, 1876 fs_info->qgroup_rescan_progress.type,
1878 (unsigned long long)fs_info->qgroup_rescan_progress.offset, 1877 fs_info->qgroup_rescan_progress.offset, ret);
1879 ret);
1880 1878
1881 if (ret) { 1879 if (ret) {
1882 /* 1880 /*
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 2ec59c4c51b7..cf5e30ff7093 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -335,7 +335,7 @@ static void backref_tree_panic(struct rb_node *rb_node, int errno, u64 bytenr)
335 if (bnode->root) 335 if (bnode->root)
336 fs_info = bnode->root->fs_info; 336 fs_info = bnode->root->fs_info;
337 btrfs_panic(fs_info, errno, "Inconsistency in backref cache " 337 btrfs_panic(fs_info, errno, "Inconsistency in backref cache "
338 "found at offset %llu\n", (unsigned long long)bytenr); 338 "found at offset %llu\n", bytenr);
339} 339}
340 340
341/* 341/*
@@ -4234,8 +4234,7 @@ int btrfs_relocate_block_group(struct btrfs_root *extent_root, u64 group_start)
4234 } 4234 }
4235 4235
4236 printk(KERN_INFO "btrfs: relocating block group %llu flags %llu\n", 4236 printk(KERN_INFO "btrfs: relocating block group %llu flags %llu\n",
4237 (unsigned long long)rc->block_group->key.objectid, 4237 rc->block_group->key.objectid, rc->block_group->flags);
4238 (unsigned long long)rc->block_group->flags);
4239 4238
4240 ret = btrfs_start_all_delalloc_inodes(fs_info, 0); 4239 ret = btrfs_start_all_delalloc_inodes(fs_info, 0);
4241 if (ret < 0) { 4240 if (ret < 0) {
@@ -4257,7 +4256,7 @@ int btrfs_relocate_block_group(struct btrfs_root *extent_root, u64 group_start)
4257 break; 4256 break;
4258 4257
4259 printk(KERN_INFO "btrfs: found %llu extents\n", 4258 printk(KERN_INFO "btrfs: found %llu extents\n",
4260 (unsigned long long)rc->extents_found); 4259 rc->extents_found);
4261 4260
4262 if (rc->stage == MOVE_DATA_EXTENTS && rc->found_file_extent) { 4261 if (rc->stage == MOVE_DATA_EXTENTS && rc->found_file_extent) {
4263 btrfs_wait_ordered_range(rc->data_inode, 0, (u64)-1); 4262 btrfs_wait_ordered_range(rc->data_inode, 0, (u64)-1);
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index c67b432d867d..0b1f4ef8db98 100644
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -155,8 +155,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
155 if (ret != 0) { 155 if (ret != 0) {
156 btrfs_print_leaf(root, path->nodes[0]); 156 btrfs_print_leaf(root, path->nodes[0]);
157 printk(KERN_CRIT "unable to update root key %llu %u %llu\n", 157 printk(KERN_CRIT "unable to update root key %llu %u %llu\n",
158 (unsigned long long)key->objectid, key->type, 158 key->objectid, key->type, key->offset);
159 (unsigned long long)key->offset);
160 BUG_ON(1); 159 BUG_ON(1);
161 } 160 }
162 161
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 266f24febce3..fcdf67ffacb0 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -754,8 +754,7 @@ out:
754 num_uncorrectable_read_errors); 754 num_uncorrectable_read_errors);
755 printk_ratelimited_in_rcu(KERN_ERR 755 printk_ratelimited_in_rcu(KERN_ERR
756 "btrfs: unable to fixup (nodatasum) error at logical %llu on dev %s\n", 756 "btrfs: unable to fixup (nodatasum) error at logical %llu on dev %s\n",
757 (unsigned long long)fixup->logical, 757 fixup->logical, rcu_str_deref(fixup->dev->name));
758 rcu_str_deref(fixup->dev->name));
759 } 758 }
760 759
761 btrfs_free_path(path); 760 btrfs_free_path(path);
@@ -1154,8 +1153,7 @@ corrected_error:
1154 spin_unlock(&sctx->stat_lock); 1153 spin_unlock(&sctx->stat_lock);
1155 printk_ratelimited_in_rcu(KERN_ERR 1154 printk_ratelimited_in_rcu(KERN_ERR
1156 "btrfs: fixed up error at logical %llu on dev %s\n", 1155 "btrfs: fixed up error at logical %llu on dev %s\n",
1157 (unsigned long long)logical, 1156 logical, rcu_str_deref(dev->name));
1158 rcu_str_deref(dev->name));
1159 } 1157 }
1160 } else { 1158 } else {
1161did_not_correct_error: 1159did_not_correct_error:
@@ -1164,8 +1162,7 @@ did_not_correct_error:
1164 spin_unlock(&sctx->stat_lock); 1162 spin_unlock(&sctx->stat_lock);
1165 printk_ratelimited_in_rcu(KERN_ERR 1163 printk_ratelimited_in_rcu(KERN_ERR
1166 "btrfs: unable to fixup (regular) error at logical %llu on dev %s\n", 1164 "btrfs: unable to fixup (regular) error at logical %llu on dev %s\n",
1167 (unsigned long long)logical, 1165 logical, rcu_str_deref(dev->name));
1168 rcu_str_deref(dev->name));
1169 } 1166 }
1170 1167
1171out: 1168out:
@@ -2455,8 +2452,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
2455 printk(KERN_ERR 2452 printk(KERN_ERR
2456 "btrfs scrub: tree block %llu spanning " 2453 "btrfs scrub: tree block %llu spanning "
2457 "stripes, ignored. logical=%llu\n", 2454 "stripes, ignored. logical=%llu\n",
2458 (unsigned long long)key.objectid, 2455 key.objectid, logical);
2459 (unsigned long long)logical);
2460 goto next; 2456 goto next;
2461 } 2457 }
2462 2458
@@ -3176,9 +3172,7 @@ static void copy_nocow_pages_worker(struct btrfs_work *work)
3176 nocow_ctx); 3172 nocow_ctx);
3177 if (ret != 0 && ret != -ENOENT) { 3173 if (ret != 0 && ret != -ENOENT) {
3178 pr_warn("iterate_inodes_from_logical() failed: log %llu, phys %llu, len %llu, mir %llu, ret %d\n", 3174 pr_warn("iterate_inodes_from_logical() failed: log %llu, phys %llu, len %llu, mir %llu, ret %d\n",
3179 (unsigned long long)logical, 3175 logical, physical_for_dev_replace, len,
3180 (unsigned long long)physical_for_dev_replace,
3181 (unsigned long long)len,
3182 (unsigned long long)mirror_num, ret); 3176 (unsigned long long)mirror_num, ret);
3183 not_written = 1; 3177 not_written = 1;
3184 goto out; 3178 goto out;
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 57090b4284fe..4d5d0f3eb0d8 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -522,7 +522,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
522 root->sectorsize); 522 root->sectorsize);
523 } 523 }
524 printk(KERN_INFO "btrfs: max_inline at %llu\n", 524 printk(KERN_INFO "btrfs: max_inline at %llu\n",
525 (unsigned long long)info->max_inline); 525 info->max_inline);
526 } else { 526 } else {
527 ret = -ENOMEM; 527 ret = -ENOMEM;
528 goto out; 528 goto out;
@@ -537,7 +537,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
537 kfree(num); 537 kfree(num);
538 printk(KERN_INFO 538 printk(KERN_INFO
539 "btrfs: allocations start at %llu\n", 539 "btrfs: allocations start at %llu\n",
540 (unsigned long long)info->alloc_start); 540 info->alloc_start);
541 } else { 541 } else {
542 ret = -ENOMEM; 542 ret = -ENOMEM;
543 goto out; 543 goto out;
@@ -947,11 +947,9 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)
947 if (btrfs_test_opt(root, NOBARRIER)) 947 if (btrfs_test_opt(root, NOBARRIER))
948 seq_puts(seq, ",nobarrier"); 948 seq_puts(seq, ",nobarrier");
949 if (info->max_inline != 8192 * 1024) 949 if (info->max_inline != 8192 * 1024)
950 seq_printf(seq, ",max_inline=%llu", 950 seq_printf(seq, ",max_inline=%llu", info->max_inline);
951 (unsigned long long)info->max_inline);
952 if (info->alloc_start != 0) 951 if (info->alloc_start != 0)
953 seq_printf(seq, ",alloc_start=%llu", 952 seq_printf(seq, ",alloc_start=%llu", info->alloc_start);
954 (unsigned long long)info->alloc_start);
955 if (info->thread_pool_size != min_t(unsigned long, 953 if (info->thread_pool_size != min_t(unsigned long,
956 num_online_cpus() + 2, 8)) 954 num_online_cpus() + 2, 8))
957 seq_printf(seq, ",thread_pool=%d", info->thread_pool_size); 955 seq_printf(seq, ",thread_pool=%d", info->thread_pool_size);
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index e0336b9a4385..cac4a3f76323 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1948,8 +1948,7 @@ int btrfs_clean_one_deleted_snapshot(struct btrfs_root *root)
1948 list_del_init(&root->root_list); 1948 list_del_init(&root->root_list);
1949 spin_unlock(&fs_info->trans_lock); 1949 spin_unlock(&fs_info->trans_lock);
1950 1950
1951 pr_debug("btrfs: cleaner removing %llu\n", 1951 pr_debug("btrfs: cleaner removing %llu\n", root->objectid);
1952 (unsigned long long)root->objectid);
1953 1952
1954 btrfs_kill_all_delayed_nodes(root); 1953 btrfs_kill_all_delayed_nodes(root);
1955 1954
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index ed685991b2c1..1534a134750f 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -914,8 +914,7 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,
914 printk(KERN_INFO "device fsid %pU ", disk_super->fsid); 914 printk(KERN_INFO "device fsid %pU ", disk_super->fsid);
915 } 915 }
916 916
917 printk(KERN_CONT "devid %llu transid %llu %s\n", 917 printk(KERN_CONT "devid %llu transid %llu %s\n", devid, transid, path);
918 (unsigned long long)devid, (unsigned long long)transid, path);
919 918
920 ret = device_list_add(path, disk_super, devid, fs_devices_ret); 919 ret = device_list_add(path, disk_super, devid, fs_devices_ret);
921 if (!ret && fs_devices_ret) 920 if (!ret && fs_devices_ret)
@@ -3159,7 +3158,7 @@ int btrfs_balance(struct btrfs_balance_control *bctl,
3159 (bctl->data.target & ~allowed))) { 3158 (bctl->data.target & ~allowed))) {
3160 printk(KERN_ERR "btrfs: unable to start balance with target " 3159 printk(KERN_ERR "btrfs: unable to start balance with target "
3161 "data profile %llu\n", 3160 "data profile %llu\n",
3162 (unsigned long long)bctl->data.target); 3161 bctl->data.target);
3163 ret = -EINVAL; 3162 ret = -EINVAL;
3164 goto out; 3163 goto out;
3165 } 3164 }
@@ -3168,7 +3167,7 @@ int btrfs_balance(struct btrfs_balance_control *bctl,
3168 (bctl->meta.target & ~allowed))) { 3167 (bctl->meta.target & ~allowed))) {
3169 printk(KERN_ERR "btrfs: unable to start balance with target " 3168 printk(KERN_ERR "btrfs: unable to start balance with target "
3170 "metadata profile %llu\n", 3169 "metadata profile %llu\n",
3171 (unsigned long long)bctl->meta.target); 3170 bctl->meta.target);
3172 ret = -EINVAL; 3171 ret = -EINVAL;
3173 goto out; 3172 goto out;
3174 } 3173 }
@@ -3177,7 +3176,7 @@ int btrfs_balance(struct btrfs_balance_control *bctl,
3177 (bctl->sys.target & ~allowed))) { 3176 (bctl->sys.target & ~allowed))) {
3178 printk(KERN_ERR "btrfs: unable to start balance with target " 3177 printk(KERN_ERR "btrfs: unable to start balance with target "
3179 "system profile %llu\n", 3178 "system profile %llu\n",
3180 (unsigned long long)bctl->sys.target); 3179 bctl->sys.target);
3181 ret = -EINVAL; 3180 ret = -EINVAL;
3182 goto out; 3181 goto out;
3183 } 3182 }
@@ -4652,8 +4651,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
4652 4651
4653 if (!em) { 4652 if (!em) {
4654 btrfs_crit(fs_info, "unable to find logical %llu len %llu", 4653 btrfs_crit(fs_info, "unable to find logical %llu len %llu",
4655 (unsigned long long)logical, 4654 logical, *length);
4656 (unsigned long long)*length);
4657 return -EINVAL; 4655 return -EINVAL;
4658 } 4656 }
4659 4657
@@ -5524,9 +5522,7 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio,
5524 5522
5525 if (map_length < length) { 5523 if (map_length < length) {
5526 btrfs_crit(root->fs_info, "mapping failed logical %llu bio len %llu len %llu", 5524 btrfs_crit(root->fs_info, "mapping failed logical %llu bio len %llu len %llu",
5527 (unsigned long long)logical, 5525 logical, length, map_length);
5528 (unsigned long long)length,
5529 (unsigned long long)map_length);
5530 BUG(); 5526 BUG();
5531 } 5527 }
5532 5528
@@ -5846,8 +5842,7 @@ static int read_one_dev(struct btrfs_root *root,
5846 return -EIO; 5842 return -EIO;
5847 5843
5848 if (!device) { 5844 if (!device) {
5849 btrfs_warn(root->fs_info, "devid %llu missing", 5845 btrfs_warn(root->fs_info, "devid %llu missing", devid);
5850 (unsigned long long)devid);
5851 device = add_missing_dev(root, devid, dev_uuid); 5846 device = add_missing_dev(root, devid, dev_uuid);
5852 if (!device) 5847 if (!device)
5853 return -ENOMEM; 5848 return -ENOMEM;
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-26 13:15:24 -0400