aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2014-12-19 12:38:41 -0500
committerChris Mason <clm@fb.com>2015-01-21 21:02:03 -0500
commitaa8ee31209d644a3f4716cb0c43aba7889fbef31 (patch)
tree2d75256c0f46b89a218d041a38c07635134a5449 /fs
parent68b663d13ceba777ee6e250154f0e3ab28bd1181 (diff)
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: David Sterba <dsterba@suse.cz> Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/disk-io.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 2a3e2252ddbf..7ff24cbcf656 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2533,7 +2533,7 @@ int open_ctree(struct super_block *sb,
2533 */ 2533 */
2534 if ((features & BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS) && 2534 if ((features & BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS) &&
2535 (sectorsize != nodesize)) { 2535 (sectorsize != nodesize)) {
2536 printk(KERN_WARNING "BTRFS: unequal leaf/node/sector sizes " 2536 printk(KERN_ERR "BTRFS: unequal leaf/node/sector sizes "
2537 "are not allowed for mixed block groups on %s\n", 2537 "are not allowed for mixed block groups on %s\n",
2538 sb->s_id); 2538 sb->s_id);
2539 goto fail_alloc; 2539 goto fail_alloc;
@@ -2641,12 +2641,12 @@ int open_ctree(struct super_block *sb,
2641 sb->s_blocksize_bits = blksize_bits(sectorsize); 2641 sb->s_blocksize_bits = blksize_bits(sectorsize);
2642 2642
2643 if (btrfs_super_magic(disk_super) != BTRFS_MAGIC) { 2643 if (btrfs_super_magic(disk_super) != BTRFS_MAGIC) {
2644 printk(KERN_INFO "BTRFS: valid FS not found on %s\n", sb->s_id); 2644 printk(KERN_ERR "BTRFS: valid FS not found on %s\n", sb->s_id);
2645 goto fail_sb_buffer; 2645 goto fail_sb_buffer;
2646 } 2646 }
2647 2647
2648 if (sectorsize != PAGE_SIZE) { 2648 if (sectorsize != PAGE_SIZE) {
2649 printk(KERN_WARNING "BTRFS: Incompatible sector size(%lu) " 2649 printk(KERN_ERR "BTRFS: incompatible sector size (%lu) "
2650 "found on %s\n", (unsigned long)sectorsize, sb->s_id); 2650 "found on %s\n", (unsigned long)sectorsize, sb->s_id);
2651 goto fail_sb_buffer; 2651 goto fail_sb_buffer;
2652 } 2652 }
@@ -2655,7 +2655,7 @@ int open_ctree(struct super_block *sb,
2655 ret = btrfs_read_sys_array(tree_root); 2655 ret = btrfs_read_sys_array(tree_root);
2656 mutex_unlock(&fs_info->chunk_mutex); 2656 mutex_unlock(&fs_info->chunk_mutex);
2657 if (ret) { 2657 if (ret) {
2658 printk(KERN_WARNING "BTRFS: failed to read the system " 2658 printk(KERN_ERR "BTRFS: failed to read the system "
2659 "array on %s\n", sb->s_id); 2659 "array on %s\n", sb->s_id);
2660 goto fail_sb_buffer; 2660 goto fail_sb_buffer;
2661 } 2661 }
@@ -2670,7 +2670,7 @@ int open_ctree(struct super_block *sb,
2670 generation); 2670 generation);
2671 if (!chunk_root->node || 2671 if (!chunk_root->node ||
2672 !test_bit(EXTENT_BUFFER_UPTODATE, &chunk_root->node->bflags)) { 2672 !test_bit(EXTENT_BUFFER_UPTODATE, &chunk_root->node->bflags)) {
2673 printk(KERN_WARNING "BTRFS: failed to read chunk root on %s\n", 2673 printk(KERN_ERR "BTRFS: failed to read chunk root on %s\n",
2674 sb->s_id); 2674 sb->s_id);
2675 goto fail_tree_roots; 2675 goto fail_tree_roots;
2676 } 2676 }
@@ -2682,7 +2682,7 @@ int open_ctree(struct super_block *sb,
2682 2682
2683 ret = btrfs_read_chunk_tree(chunk_root); 2683 ret = btrfs_read_chunk_tree(chunk_root);
2684 if (ret) { 2684 if (ret) {
2685 printk(KERN_WARNING "BTRFS: failed to read chunk tree on %s\n", 2685 printk(KERN_ERR "BTRFS: failed to read chunk tree on %s\n",
2686 sb->s_id); 2686 sb->s_id);
2687 goto fail_tree_roots; 2687 goto fail_tree_roots;
2688 } 2688 }
@@ -2694,7 +2694,7 @@ int open_ctree(struct super_block *sb,
2694 btrfs_close_extra_devices(fs_info, fs_devices, 0); 2694 btrfs_close_extra_devices(fs_info, fs_devices, 0);
2695 2695
2696 if (!fs_devices->latest_bdev) { 2696 if (!fs_devices->latest_bdev) {
2697 printk(KERN_CRIT "BTRFS: failed to read devices on %s\n", 2697 printk(KERN_ERR "BTRFS: failed to read devices on %s\n",
2698 sb->s_id); 2698 sb->s_id);
2699 goto fail_tree_roots; 2699 goto fail_tree_roots;
2700 } 2700 }
@@ -2778,7 +2778,7 @@ retry_root_backup:
2778 2778
2779 ret = btrfs_recover_balance(fs_info); 2779 ret = btrfs_recover_balance(fs_info);
2780 if (ret) { 2780 if (ret) {
2781 printk(KERN_WARNING "BTRFS: failed to recover balance\n"); 2781 printk(KERN_ERR "BTRFS: failed to recover balance\n");
2782 goto fail_block_groups; 2782 goto fail_block_groups;
2783 } 2783 }
2784 2784