Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 301993a4 authored by Stefan Behrens's avatar Stefan Behrens Committed by Chris Mason
Browse files

Btrfs: check_int, remove warning for mixed-mode 



In mixed-mode, when a data-block was later reused for metadata, a
warning was printed. This condition is now filtered out and the
warning is eliminated in this case.

Signed-off-by: default avatarStefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent a5f519c9

fs/btrfs/check-integrity.c

+5 −4
Original line number Diff line number Diff line
@@ -1900,7 +1900,9 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, 
							       dev_state,

							       dev_bytenr);

			}

			if (block->logical_bytenr != bytenr) {

			if (block->logical_bytenr != bytenr &&

			    !(!block->is_metadata &&

			      block->logical_bytenr == 0))

				printk(KERN_INFO

				       "Written block @%llu (%s/%llu/%d)"

				       " found in hash table, %c,"
@@ -1910,15 +1912,14 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, 
				       block->mirror_num,

				       btrfsic_get_block_type(state, block),

				       block->logical_bytenr);

				block->logical_bytenr = bytenr;

			} else if (state->print_mask &

				   BTRFSIC_PRINT_MASK_VERBOSE)

			else if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE)

				printk(KERN_INFO

				       "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));

			block->logical_bytenr = bytenr;

		} else {

			if (num_pages * PAGE_CACHE_SIZE <

			    state->datablock_size) {