Commit aa8ee312 authored by David Sterba's avatar David Sterba Committed by Chris Mason
Browse files

btrfs: update message levels during failed mount 



All error conditions from open_ctree shall be ERR. Warning would
suggest that something's wrong and we can continue.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 68b663d1

fs/btrfs/disk-io.c

+8 −8
Original line number Diff line number Diff line
@@ -2533,7 +2533,7 @@ int open_ctree(struct super_block *sb, 
	 */

	if ((features & BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS) &&

	    (sectorsize != nodesize)) {

		printk(KERN_WARNING "BTRFS: unequal leaf/node/sector sizes "

		printk(KERN_ERR "BTRFS: unequal leaf/node/sector sizes "

				"are not allowed for mixed block groups on %s\n",

				sb->s_id);

		goto fail_alloc;
@@ -2641,12 +2641,12 @@ int open_ctree(struct super_block *sb, 
	sb->s_blocksize_bits = blksize_bits(sectorsize);



	if (btrfs_super_magic(disk_super) != BTRFS_MAGIC) {

		printk(KERN_INFO "BTRFS: valid FS not found on %s\n", sb->s_id);

		printk(KERN_ERR "BTRFS: valid FS not found on %s\n", sb->s_id);

		goto fail_sb_buffer;

	}



	if (sectorsize != PAGE_SIZE) {

		printk(KERN_WARNING "BTRFS: Incompatible sector size(%lu) "

		printk(KERN_ERR "BTRFS: incompatible sector size (%lu) "

		       "found on %s\n", (unsigned long)sectorsize, sb->s_id);

		goto fail_sb_buffer;

	}
@@ -2655,7 +2655,7 @@ int open_ctree(struct super_block *sb, 
	ret = btrfs_read_sys_array(tree_root);

	mutex_unlock(&fs_info->chunk_mutex);

	if (ret) {

		printk(KERN_WARNING "BTRFS: failed to read the system "

		printk(KERN_ERR "BTRFS: failed to read the system "

		       "array on %s\n", sb->s_id);

		goto fail_sb_buffer;

	}
@@ -2670,7 +2670,7 @@ int open_ctree(struct super_block *sb, 
					   generation);

	if (!chunk_root->node ||

	    !test_bit(EXTENT_BUFFER_UPTODATE, &chunk_root->node->bflags)) {

		printk(KERN_WARNING "BTRFS: failed to read chunk root on %s\n",

		printk(KERN_ERR "BTRFS: failed to read chunk root on %s\n",

		       sb->s_id);

		goto fail_tree_roots;

	}
@@ -2682,7 +2682,7 @@ int open_ctree(struct super_block *sb, 


	ret = btrfs_read_chunk_tree(chunk_root);

	if (ret) {

		printk(KERN_WARNING "BTRFS: failed to read chunk tree on %s\n",

		printk(KERN_ERR "BTRFS: failed to read chunk tree on %s\n",

		       sb->s_id);

		goto fail_tree_roots;

	}
@@ -2694,7 +2694,7 @@ int open_ctree(struct super_block *sb, 
	btrfs_close_extra_devices(fs_info, fs_devices, 0);



	if (!fs_devices->latest_bdev) {

		printk(KERN_CRIT "BTRFS: failed to read devices on %s\n",

		printk(KERN_ERR "BTRFS: failed to read devices on %s\n",

		       sb->s_id);

		goto fail_tree_roots;

	}
@@ -2778,7 +2778,7 @@ int open_ctree(struct super_block *sb, 


	ret = btrfs_recover_balance(fs_info);

	if (ret) {

		printk(KERN_WARNING "BTRFS: failed to recover balance\n");

		printk(KERN_ERR "BTRFS: failed to recover balance\n");

		goto fail_block_groups;

	}