btrfs: unsplit printed strings (5d163e0e) · Commits · e / devices / android_kernel_teracube_emerald

fs/btrfs/backref.c

+5 −10

Original line number	Diff line number	Diff line
		@@ -650,8 +650,7 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info,
		/* root node has been locked, we can release @subvol_srcu safely here */
		srcu_read_unlock(&fs_info->subvol_srcu, index);

		pr_debug("search slot in root %llu (level %d, ref count %d) returned "
		"%d for key (%llu %u %llu)\n",
		pr_debug("search slot in root %llu (level %d, ref count %d) returned %d for key (%llu %u %llu)\n",
		ref->root_id, level, ref->count, ret,
		ref->key_for_search.objectid, ref->key_for_search.type,
		ref->key_for_search.offset);
		@@ -1846,8 +1845,7 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical,
		ei = btrfs_item_ptr(eb, path->slots[0], struct btrfs_extent_item);
		flags = btrfs_extent_flags(eb, ei);

		pr_debug("logical %llu is at position %llu within the extent (%llu "
		"EXTENT_ITEM %llu) flags %#llx size %u\n",
		pr_debug("logical %llu is at position %llu within the extent (%llu EXTENT_ITEM %llu) flags %#llx size %u\n",
		logical, logical - found_key->objectid, found_key->objectid,
		found_key->offset, flags, item_size);

		@@ -1976,8 +1974,7 @@ static int iterate_leaf_refs(struct extent_inode_elem *inode_list,
		int ret = 0;

		for (eie = inode_list; eie; eie = eie->next) {
		pr_debug("ref for %llu resolved, key (%llu EXTEND_DATA %llu), "
		"root %llu\n", extent_item_objectid,
		pr_debug("ref for %llu resolved, key (%llu EXTEND_DATA %llu), root %llu\n", extent_item_objectid,
		eie->inum, eie->offset, root);
		ret = iterate(eie->inum, eie->offset, root, ctx);
		if (ret) {
		@@ -2036,8 +2033,7 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info,
		break;
		ULIST_ITER_INIT(&root_uiter);
		while (!ret && (root_node = ulist_next(roots, &root_uiter))) {
		pr_debug("root %llu references leaf %llu, data list "
		"%#llx\n", root_node->val, ref_node->val,
		pr_debug("root %llu references leaf %llu, data list %#llx\n", root_node->val, ref_node->val,
		ref_node->aux);
		ret = iterate_leaf_refs((struct extent_inode_elem *)
		(uintptr_t)ref_node->aux,
		@@ -2135,8 +2131,7 @@ static int iterate_inode_refs(u64 inum, struct btrfs_root *fs_root,
		for (cur = 0; cur < btrfs_item_size(eb, item); cur += len) {
		name_len = btrfs_inode_ref_name_len(eb, iref);
		/* path must be released before calling iterate()! */
		pr_debug("following ref at offset %u for inode %llu in "
		"tree %llu\n", cur, found_key.objectid,
		pr_debug("following ref at offset %u for inode %llu in tree %llu\n", cur, found_key.objectid,
		fs_root->objectid);
		ret = iterate(parent, name_len,
		(unsigned long)(iref + 1), eb, ctx);

fs/btrfs/check-integrity.c

+40 −103

Original line number	Diff line number	Diff line
		@@ -733,9 +733,7 @@ static int btrfsic_process_superblock(struct btrfsic_state *state,
		&tmp_next_block_ctx,
		mirror_num);
		if (ret) {
		printk(KERN_INFO "btrfsic:"
		" btrfsic_map_block(root @%llu,"
		" mirror %d) failed!\n",
		printk(KERN_INFO "btrfsic: btrfsic_map_block(root @%llu, mirror %d) failed!\n",
		next_bytenr, mirror_num);
		kfree(selected_super);
		return -1;
		@@ -905,8 +903,7 @@ static int btrfsic_process_superblock_dev_mirror(
		state->metablock_size,
		&tmp_next_block_ctx,
		mirror_num)) {
		printk(KERN_INFO "btrfsic: btrfsic_map_block("
		"bytenr @%llu, mirror %d) failed!\n",
		printk(KERN_INFO "btrfsic: btrfsic_map_block(bytenr @%llu, mirror %d) failed!\n",
		next_bytenr, mirror_num);
		brelse(bh);
		return -1;
		@@ -995,8 +992,7 @@ static int btrfsic_process_metablock(

		if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
		printk(KERN_INFO
		"leaf %llu items %d generation %llu"
		" owner %llu\n",
		"leaf %llu items %d generation %llu owner %llu\n",
		sf->block_ctx->start, sf->nr,
		btrfs_stack_header_generation(
		&leafhdr->header),
		@@ -1120,8 +1116,7 @@ static int btrfsic_process_metablock(
		sf->nr = btrfs_stack_header_nritems(&nodehdr->header);

		if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
		printk(KERN_INFO "node %llu level %d items %d"
		" generation %llu owner %llu\n",
		printk(KERN_INFO "node %llu level %d items %d generation %llu owner %llu\n",
		sf->block_ctx->start,
		nodehdr->header.level, sf->nr,
		btrfs_stack_header_generation(
		@@ -1457,8 +1452,7 @@ static int btrfsic_handle_extent_data(
		generation = btrfs_stack_file_extent_generation(&file_extent_item);

		if (state->print_mask & BTRFSIC_PRINT_MASK_VERY_VERBOSE)
		printk(KERN_INFO "extent_data: type %u, disk_bytenr = %llu,"
		" offset = %llu, num_bytes = %llu\n",
		printk(KERN_INFO "extent_data: type %u, disk_bytenr = %llu, offset = %llu, num_bytes = %llu\n",
		file_extent_item.type,
		btrfs_stack_file_extent_disk_bytenr(&file_extent_item),
		btrfs_stack_file_extent_offset(&file_extent_item),
		@@ -1485,8 +1479,7 @@ static int btrfsic_handle_extent_data(
		int block_was_created;

		if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
		printk(KERN_INFO "btrfsic_handle_extent_data("
		"mirror_num=%d)\n", mirror_num);
		printk(KERN_INFO "btrfsic_handle_extent_data(mirror_num=%d)\n", mirror_num);
		if (state->print_mask & BTRFSIC_PRINT_MASK_VERY_VERBOSE)
		printk(KERN_INFO
		"\tdisk_bytenr = %llu, num_bytes %u\n",
		@@ -1496,8 +1489,7 @@ static int btrfsic_handle_extent_data(
		mirror_num);
		if (ret) {
		printk(KERN_INFO
		"btrfsic: btrfsic_map_block(@%llu,"
		" mirror=%d) failed!\n",
		"btrfsic: btrfsic_map_block(@%llu, mirror=%d) failed!\n",
		next_bytenr, mirror_num);
		return -1;
		}
		@@ -1524,11 +1516,7 @@ static int btrfsic_handle_extent_data(
		!(!next_block->is_metadata &&
		0 == next_block->logical_bytenr)) {
		printk(KERN_INFO
		"Referenced block"
		" @%llu (%s/%llu/%d)"
		" found in hash table, D,"
		" bytenr mismatch"
		" (!= stored %llu).\n",
		"Referenced block @%llu (%s/%llu/%d) found in hash table, D, bytenr mismatch (!= stored %llu).\n",
		next_bytenr,
		next_block_ctx.dev->name,
		next_block_ctx.dev_bytenr,
		@@ -1725,9 +1713,7 @@ static void btrfsic_dump_database(struct btrfsic_state *state)
		b_all->dev_bytenr, b_all->mirror_num);

		list_for_each_entry(l, &b_all->ref_to_list, node_ref_to) {
		printk(KERN_INFO " %c @%llu (%s/%llu/%d)"
		" refers %u* to"
		" %c @%llu (%s/%llu/%d)\n",
		printk(KERN_INFO " %c @%llu (%s/%llu/%d) refers %u* to %c @%llu (%s/%llu/%d)\n",
		btrfsic_get_block_type(state, b_all),
		b_all->logical_bytenr, b_all->dev_state->name,
		b_all->dev_bytenr, b_all->mirror_num,
		@@ -1740,9 +1726,7 @@ static void btrfsic_dump_database(struct btrfsic_state *state)
		}

		list_for_each_entry(l, &b_all->ref_from_list, node_ref_from) {
		printk(KERN_INFO " %c @%llu (%s/%llu/%d)"
		" is ref %u* from"
		" %c @%llu (%s/%llu/%d)\n",
		printk(KERN_INFO " %c @%llu (%s/%llu/%d) is ref %u* from %c @%llu (%s/%llu/%d)\n",
		btrfsic_get_block_type(state, b_all),
		b_all->logical_bytenr, b_all->dev_state->name,
		b_all->dev_bytenr, b_all->mirror_num,
		@@ -1891,8 +1875,7 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state,
		bytenr = block->logical_bytenr;
		if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
		printk(KERN_INFO
		"Written block @%llu (%s/%llu/%d)"
		" found in hash table, %c.\n",
		"Written block @%llu (%s/%llu/%d) found in hash table, %c.\n",
		bytenr, dev_state->name, dev_bytenr,
		block->mirror_num,
		btrfsic_get_block_type(state, block));
		@@ -1904,12 +1887,7 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state,
		list_empty(&block->ref_to_list) ? ' ' : '!',
		list_empty(&block->ref_from_list) ? ' ' : '!');
		if (btrfsic_is_block_ref_by_superblock(state, block, 0)) {
		printk(KERN_INFO "btrfs: attempt to overwrite %c-block"
		" @%llu (%s/%llu/%d), old(gen=%llu,"
		" objectid=%llu, type=%d, offset=%llu),"
		" new(gen=%llu),"
		" which is referenced by most recent superblock"
		" (superblockgen=%llu)!\n",
		printk(KERN_INFO "btrfs: attempt to overwrite %c-block @%llu (%s/%llu/%d), old(gen=%llu, objectid=%llu, type=%d, offset=%llu), new(gen=%llu), which is referenced by most recent superblock (superblockgen=%llu)!\n",
		btrfsic_get_block_type(state, block), bytenr,
		dev_state->name, dev_bytenr, block->mirror_num,
		block->generation,
		@@ -1923,9 +1901,7 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state,
		}

		if (!block->is_iodone && !block->never_written) {
		printk(KERN_INFO "btrfs: attempt to overwrite %c-block"
		" @%llu (%s/%llu/%d), oldgen=%llu, newgen=%llu,"
		" which is not yet iodone!\n",
		printk(KERN_INFO "btrfs: attempt to overwrite %c-block @%llu (%s/%llu/%d), oldgen=%llu, newgen=%llu, which is not yet iodone!\n",
		btrfsic_get_block_type(state, block), bytenr,
		dev_state->name, dev_bytenr, block->mirror_num,
		block->generation,
		@@ -2037,8 +2013,7 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state,
		}
		if (ret)
		printk(KERN_INFO
		"btrfsic: btrfsic_process_metablock"
		"(root @%llu) failed!\n",
		"btrfsic: btrfsic_process_metablock(root @%llu) failed!\n",
		dev_bytenr);
		} else {
		block->is_metadata = 0;
		@@ -2065,8 +2040,7 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state,
		if (!is_metadata) {
		processed_len = state->datablock_size;
		if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
		printk(KERN_INFO "Written block (%s/%llu/?)"
		" !found in hash table, D.\n",
		printk(KERN_INFO "Written block (%s/%llu/?) !found in hash table, D.\n",
		dev_state->name, dev_bytenr);
		if (!state->include_extent_data) {
		/* ignore that written D block */
		@@ -2085,8 +2059,7 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state,
		dev_bytenr);
		if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
		printk(KERN_INFO
		"Written block @%llu (%s/%llu/?)"
		" !found in hash table, M.\n",
		"Written block @%llu (%s/%llu/?) !found in hash table, M.\n",
		bytenr, dev_state->name, dev_bytenr);
		}

		@@ -2163,8 +2136,7 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state,
		&block_ctx, 0, 0);
		if (ret)
		printk(KERN_INFO
		"btrfsic: process_metablock(root @%llu)"
		" failed!\n",
		"btrfsic: process_metablock(root @%llu) failed!\n",
		dev_bytenr);
		}
		btrfsic_release_block_ctx(&block_ctx);
		@@ -2272,8 +2244,7 @@ static int btrfsic_process_written_superblock(
		0 == state->max_superblock_generation)) {
		if (state->print_mask & BTRFSIC_PRINT_MASK_SUPERBLOCK_WRITE)
		printk(KERN_INFO
		"btrfsic: superblock @%llu (%s/%llu/%d)"
		" with old gen %llu <= %llu\n",
		"btrfsic: superblock @%llu (%s/%llu/%d) with old gen %llu <= %llu\n",
		superblock->logical_bytenr,
		superblock->dev_state->name,
		superblock->dev_bytenr, superblock->mirror_num,
		@@ -2282,8 +2253,7 @@ static int btrfsic_process_written_superblock(
		} else {
		if (state->print_mask & BTRFSIC_PRINT_MASK_SUPERBLOCK_WRITE)
		printk(KERN_INFO
		"btrfsic: got new superblock @%llu (%s/%llu/%d)"
		" with new gen %llu > %llu\n",
		"btrfsic: got new superblock @%llu (%s/%llu/%d) with new gen %llu > %llu\n",
		superblock->logical_bytenr,
		superblock->dev_state->name,
		superblock->dev_bytenr, superblock->mirror_num,
		@@ -2353,16 +2323,14 @@ static int btrfsic_process_written_superblock(

		if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
		printk(KERN_INFO
		"btrfsic_process_written_superblock("
		"mirror_num=%d)\n", mirror_num);
		"btrfsic_process_written_superblock(mirror_num=%d)\n", mirror_num);
		ret = btrfsic_map_block(state, next_bytenr,
		BTRFS_SUPER_INFO_SIZE,
		&tmp_next_block_ctx,
		mirror_num);
		if (ret) {
		printk(KERN_INFO
		"btrfsic: btrfsic_map_block(@%llu,"
		" mirror=%d) failed!\n",
		"btrfsic: btrfsic_map_block(@%llu, mirror=%d) failed!\n",
		next_bytenr, mirror_num);
		return -1;
		}
		@@ -2438,8 +2406,7 @@ static int btrfsic_check_all_ref_blocks(struct btrfsic_state *state,
		list_for_each_entry(l, &block->ref_to_list, node_ref_to) {
		if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
		printk(KERN_INFO
		"rl=%d, %c @%llu (%s/%llu/%d)"
		" %u* refers to %c @%llu (%s/%llu/%d)\n",
		"rl=%d, %c @%llu (%s/%llu/%d) %u* refers to %c @%llu (%s/%llu/%d)\n",
		recursion_level,
		btrfsic_get_block_type(state, block),
		block->logical_bytenr, block->dev_state->name,
		@@ -2451,9 +2418,7 @@ static int btrfsic_check_all_ref_blocks(struct btrfsic_state *state,
		l->block_ref_to->dev_bytenr,
		l->block_ref_to->mirror_num);
		if (l->block_ref_to->never_written) {
		printk(KERN_INFO "btrfs: attempt to write superblock"
		" which references block %c @%llu (%s/%llu/%d)"
		" which is never written!\n",
		printk(KERN_INFO "btrfs: attempt to write superblock which references block %c @%llu (%s/%llu/%d) which is never written!\n",
		btrfsic_get_block_type(state, l->block_ref_to),
		l->block_ref_to->logical_bytenr,
		l->block_ref_to->dev_state->name,
		@@ -2461,9 +2426,7 @@ static int btrfsic_check_all_ref_blocks(struct btrfsic_state *state,
		l->block_ref_to->mirror_num);
		ret = -1;
		} else if (!l->block_ref_to->is_iodone) {
		printk(KERN_INFO "btrfs: attempt to write superblock"
		" which references block %c @%llu (%s/%llu/%d)"
		" which is not yet iodone!\n",
		printk(KERN_INFO "btrfs: attempt to write superblock which references block %c @%llu (%s/%llu/%d) which is not yet iodone!\n",
		btrfsic_get_block_type(state, l->block_ref_to),
		l->block_ref_to->logical_bytenr,
		l->block_ref_to->dev_state->name,
		@@ -2471,9 +2434,7 @@ static int btrfsic_check_all_ref_blocks(struct btrfsic_state *state,
		l->block_ref_to->mirror_num);
		ret = -1;
		} else if (l->block_ref_to->iodone_w_error) {
		printk(KERN_INFO "btrfs: attempt to write superblock"
		" which references block %c @%llu (%s/%llu/%d)"
		" which has write error!\n",
		printk(KERN_INFO "btrfs: attempt to write superblock which references block %c @%llu (%s/%llu/%d) which has write error!\n",
		btrfsic_get_block_type(state, l->block_ref_to),
		l->block_ref_to->logical_bytenr,
		l->block_ref_to->dev_state->name,
		@@ -2486,10 +2447,7 @@ static int btrfsic_check_all_ref_blocks(struct btrfsic_state *state,
		l->parent_generation &&
		BTRFSIC_GENERATION_UNKNOWN !=
		l->block_ref_to->generation) {
		printk(KERN_INFO "btrfs: attempt to write superblock"
		" which references block %c @%llu (%s/%llu/%d)"
		" with generation %llu !="
		" parent generation %llu!\n",
		printk(KERN_INFO "btrfs: attempt to write superblock which references block %c @%llu (%s/%llu/%d) with generation %llu != parent generation %llu!\n",
		btrfsic_get_block_type(state, l->block_ref_to),
		l->block_ref_to->logical_bytenr,
		l->block_ref_to->dev_state->name,
		@@ -2500,11 +2458,7 @@ static int btrfsic_check_all_ref_blocks(struct btrfsic_state *state,
		ret = -1;
		} else if (l->block_ref_to->flush_gen >
		l->block_ref_to->dev_state->last_flush_gen) {
		printk(KERN_INFO "btrfs: attempt to write superblock"
		" which references block %c @%llu (%s/%llu/%d)"
		" which is not flushed out of disk's write cache"
		" (block flush_gen=%llu,"
		" dev->flush_gen=%llu)!\n",
		printk(KERN_INFO "btrfs: attempt to write superblock which references block %c @%llu (%s/%llu/%d) which is not flushed out of disk's write cache (block flush_gen=%llu, dev->flush_gen=%llu)!\n",
		btrfsic_get_block_type(state, l->block_ref_to),
		l->block_ref_to->logical_bytenr,
		l->block_ref_to->dev_state->name,
		@@ -2546,8 +2500,7 @@ static int btrfsic_is_block_ref_by_superblock(
		list_for_each_entry(l, &block->ref_from_list, node_ref_from) {
		if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)
		printk(KERN_INFO
		"rl=%d, %c @%llu (%s/%llu/%d)"
		" is ref %u* from %c @%llu (%s/%llu/%d)\n",
		"rl=%d, %c @%llu (%s/%llu/%d) is ref %u* from %c @%llu (%s/%llu/%d)\n",
		recursion_level,
		btrfsic_get_block_type(state, block),
		block->logical_bytenr, block->dev_state->name,
		@@ -2578,8 +2531,7 @@ static void btrfsic_print_add_link(const struct btrfsic_state *state,
		const struct btrfsic_block_link *l)
		{
		printk(KERN_INFO
		"Add %u* link from %c @%llu (%s/%llu/%d)"
		" to %c @%llu (%s/%llu/%d).\n",
		"Add %u* link from %c @%llu (%s/%llu/%d) to %c @%llu (%s/%llu/%d).\n",
		l->ref_cnt,
		btrfsic_get_block_type(state, l->block_ref_from),
		l->block_ref_from->logical_bytenr,
		@@ -2595,8 +2547,7 @@ static void btrfsic_print_rem_link(const struct btrfsic_state *state,
		const struct btrfsic_block_link *l)
		{
		printk(KERN_INFO
		"Rem %u* link from %c @%llu (%s/%llu/%d)"
		" to %c @%llu (%s/%llu/%d).\n",
		"Rem %u* link from %c @%llu (%s/%llu/%d) to %c @%llu (%s/%llu/%d).\n",
		l->ref_cnt,
		btrfsic_get_block_type(state, l->block_ref_from),
		l->block_ref_from->logical_bytenr,
		@@ -2709,7 +2660,7 @@ static struct btrfsic_block_link *btrfsic_block_link_lookup_or_add(
		l = btrfsic_block_link_alloc();
		if (NULL == l) {
		printk(KERN_INFO
		"btrfsic: error, kmalloc" " failed!\n");
		"btrfsic: error, kmalloc failed!\n");
		return NULL;
		}

		@@ -2810,9 +2761,7 @@ static void btrfsic_cmp_log_and_dev_bytenr(struct btrfsic_state *state,
		ret = btrfsic_map_block(state, bytenr, state->metablock_size,
		&block_ctx, mirror_num);
		if (ret) {
		printk(KERN_INFO "btrfsic:"
		" btrfsic_map_block(logical @%llu,"
		" mirror %d) failed!\n",
		printk(KERN_INFO "btrfsic: btrfsic_map_block(logical @%llu, mirror %d) failed!\n",
		bytenr, mirror_num);
		continue;
		}
		@@ -2827,9 +2776,7 @@ static void btrfsic_cmp_log_and_dev_bytenr(struct btrfsic_state *state,
		}

		if (WARN_ON(!match)) {
		printk(KERN_INFO "btrfs: attempt to write M-block which contains logical bytenr that doesn't map to dev+physical bytenr of submit_bio,"
		" buffer->log_bytenr=%llu, submit_bio(bdev=%s,"
		" phys_bytenr=%llu)!\n",
		printk(KERN_INFO "btrfs: attempt to write M-block which contains logical bytenr that doesn't map to dev+physical bytenr of submit_bio, buffer->log_bytenr=%llu, submit_bio(bdev=%s, phys_bytenr=%llu)!\n",
		bytenr, dev_state->name, dev_bytenr);
		for (mirror_num = 1; mirror_num <= num_copies; mirror_num++) {
		ret = btrfsic_map_block(state, bytenr,
		@@ -2838,8 +2785,7 @@ static void btrfsic_cmp_log_and_dev_bytenr(struct btrfsic_state *state,
		if (ret)
		continue;

		printk(KERN_INFO "Read logical bytenr @%llu maps to"
		" (%s/%llu/%d)\n",
		printk(KERN_INFO "Read logical bytenr @%llu maps to (%s/%llu/%d)\n",
		bytenr, block_ctx.dev->name,
		block_ctx.dev_bytenr, mirror_num);
		}
		@@ -2874,8 +2820,7 @@ int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh)
		if (dev_state->state->print_mask &
		BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH)
		printk(KERN_INFO
		"submit_bh(op=0x%x,0x%x, blocknr=%llu "
		"(bytenr %llu), size=%zu, data=%p, bdev=%p)\n",
		"submit_bh(op=0x%x,0x%x, blocknr=%llu (bytenr %llu), size=%zu, data=%p, bdev=%p)\n",
		op, op_flags, (unsigned long long)bh->b_blocknr,
		dev_bytenr, bh->b_size, bh->b_data, bh->b_bdev);
		btrfsic_process_written_block(dev_state, dev_bytenr,
		@@ -2892,9 +2837,7 @@ int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh)
		(BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH \|
		BTRFSIC_PRINT_MASK_VERBOSE)))
		printk(KERN_INFO
		"btrfsic_submit_bh(%s) with FLUSH"
		" but dummy block already in use"
		" (ignored)!\n",
		"btrfsic_submit_bh(%s) with FLUSH but dummy block already in use (ignored)!\n",
		dev_state->name);
		} else {
		struct btrfsic_block *const block =
		@@ -2940,8 +2883,7 @@ static void __btrfsic_submit_bio(struct bio *bio)
		if (dev_state->state->print_mask &
		BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH)
		printk(KERN_INFO
		"submit_bio(rw=%d,0x%x, bi_vcnt=%u,"
		" bi_sector=%llu (bytenr %llu), bi_bdev=%p)\n",
		"submit_bio(rw=%d,0x%x, bi_vcnt=%u, bi_sector=%llu (bytenr %llu), bi_bdev=%p)\n",
		bio_op(bio), bio->bi_opf, bio->bi_vcnt,
		(unsigned long long)bio->bi_iter.bi_sector,
		dev_bytenr, bio->bi_bdev);
		@@ -2990,9 +2932,7 @@ static void __btrfsic_submit_bio(struct bio *bio)
		(BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH \|
		BTRFSIC_PRINT_MASK_VERBOSE)))
		printk(KERN_INFO
		"btrfsic_submit_bio(%s) with FLUSH"
		" but dummy block already in use"
		" (ignored)!\n",
		"btrfsic_submit_bio(%s) with FLUSH but dummy block already in use (ignored)!\n",
		dev_state->name);
		} else {
		struct btrfsic_block *const block =
		@@ -3146,8 +3086,7 @@ void btrfsic_unmount(struct btrfs_root *root,

		if (NULL == state) {
		printk(KERN_INFO
		"btrfsic: error, cannot find state information"
		" on umount!\n");
		"btrfsic: error, cannot find state information on umount!\n");
		mutex_unlock(&btrfsic_mutex);
		return;
		}
		@@ -3174,9 +3113,7 @@ void btrfsic_unmount(struct btrfs_root *root,
		if (b_all->is_iodone \|\| b_all->never_written)
		btrfsic_block_free(b_all);
		else
		printk(KERN_INFO "btrfs: attempt to free %c-block"
		" @%llu (%s/%llu/%d) on umount which is"
		" not yet iodone!\n",
		printk(KERN_INFO "btrfs: attempt to free %c-block @%llu (%s/%llu/%d) on umount which is not yet iodone!\n",
		btrfsic_get_block_type(state, b_all),
		b_all->logical_bytenr, b_all->dev_state->name,
		b_all->dev_bytenr, b_all->mirror_num);

fs/btrfs/ctree.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -4768,7 +4768,8 @@ void setup_items_for_insert(struct btrfs_root root, struct btrfs_path path,

		if (btrfs_leaf_free_space(root, leaf) < total_size) {
		btrfs_print_leaf(root, leaf);
		btrfs_crit(root->fs_info, "not enough freespace need %u have %d",
		btrfs_crit(root->fs_info,
		"not enough freespace need %u have %d",
		total_size, btrfs_leaf_free_space(root, leaf));
		BUG();
		}
		@@ -4778,7 +4779,8 @@ void setup_items_for_insert(struct btrfs_root root, struct btrfs_path path,

		if (old_data < data_end) {
		btrfs_print_leaf(root, leaf);
		btrfs_crit(root->fs_info, "slot %d old_data %d data_end %d",
		btrfs_crit(root->fs_info,
		"slot %d old_data %d data_end %d",
		slot, old_data, data_end);
		BUG_ON(1);
		}

fs/btrfs/delayed-inode.c

+7 −10

Original line number	Diff line number	Diff line
		@@ -1478,9 +1478,8 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,
		mutex_lock(&delayed_node->mutex);
		ret = __btrfs_add_delayed_insertion_item(delayed_node, delayed_item);
		if (unlikely(ret)) {
		btrfs_err(root->fs_info, "err add delayed dir index item(name: %.*s) "
		"into the insertion tree of the delayed node"
		"(root id: %llu, inode id: %llu, errno: %d)",
		btrfs_err(root->fs_info,
		"err add delayed dir index item(name: %.*s) into the insertion tree of the delayed node(root id: %llu, inode id: %llu, errno: %d)",
		name_len, name, delayed_node->root->objectid,
		delayed_node->inode_id, ret);
		BUG();
		@@ -1550,11 +1549,9 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,
		mutex_lock(&node->mutex);
		ret = __btrfs_add_delayed_deletion_item(node, item);
		if (unlikely(ret)) {
		btrfs_err(root->fs_info, "err add delayed dir index item(index: %llu) "
		"into the deletion tree of the delayed node"
		"(root id: %llu, inode id: %llu, errno: %d)",
		index, node->root->objectid, node->inode_id,
		ret);
		btrfs_err(root->fs_info,
		"err add delayed dir index item(index: %llu) into the deletion tree of the delayed node(root id: %llu, inode id: %llu, errno: %d)",
		index, node->root->objectid, node->inode_id, ret);
		BUG();
		}
		mutex_unlock(&node->mutex);

fs/btrfs/dev-replace.c

+11 −8

Original line number	Diff line number	Diff line
		@@ -218,7 +218,8 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans,
		}
		ret = btrfs_search_slot(trans, dev_root, &key, path, -1, 1);
		if (ret < 0) {
		btrfs_warn(fs_info, "error %d while searching for dev_replace item!",
		btrfs_warn(fs_info,
		"error %d while searching for dev_replace item!",
		ret);
		goto out;
		}
		@@ -238,7 +239,8 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans,
		*/
		ret = btrfs_del_item(trans, dev_root, path);
		if (ret != 0) {
		btrfs_warn(fs_info, "delete too small dev_replace item failed %d!",
		btrfs_warn(fs_info,
		"delete too small dev_replace item failed %d!",
		ret);
		goto out;
		}
		@@ -251,8 +253,8 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans,
		ret = btrfs_insert_empty_item(trans, dev_root, path,
		&key, sizeof(*ptr));
		if (ret < 0) {
		btrfs_warn(fs_info, "insert dev_replace item failed %d!",
		ret);
		btrfs_warn(fs_info,
		"insert dev_replace item failed %d!", ret);
		goto out;
		}
		}
		@@ -772,7 +774,8 @@ int btrfs_resume_dev_replace_async(struct btrfs_fs_info *fs_info)
		break;
		}
		if (!dev_replace->tgtdev \|\| !dev_replace->tgtdev->bdev) {
		btrfs_info(fs_info, "cannot continue dev_replace, tgtdev is missing");
		btrfs_info(fs_info,
		"cannot continue dev_replace, tgtdev is missing");
		btrfs_info(fs_info,
		"you may cancel the operation after 'mount -o degraded'");
		btrfs_dev_replace_unlock(dev_replace, 1);