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

Commit 83121942 authored by David Woodhouse's avatar David Woodhouse Committed by Chris Mason
Browse files

Btrfs: Fix crash on read failures at mount 



If the tree roots hit read errors during mount, btrfs is not properly
erroring out.  We need to check the uptodate bits after
reading in the tree root node.

Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent c271b492

fs/btrfs/disk-io.c

+10 −0
Original line number Diff line number Diff line
@@ -1783,6 +1783,11 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
					   btrfs_super_chunk_root(disk_super),

					   blocksize, generation);

	BUG_ON(!chunk_root->node);

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

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

		       sb->s_id);

		goto fail_chunk_root;

	}

	btrfs_set_root_node(&chunk_root->root_item, chunk_root->node);

	chunk_root->commit_root = btrfs_root_node(chunk_root);
@@ -1810,6 +1815,11 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
					  blocksize, generation);

	if (!tree_root->node)

		goto fail_chunk_root;

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

		printk(KERN_WARNING "btrfs: failed to read tree root on %s\n",

		       sb->s_id);

		goto fail_tree_root;

	}

	btrfs_set_root_node(&tree_root->root_item, tree_root->node);

	tree_root->commit_root = btrfs_root_node(tree_root);