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

Commit 586e46e2 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

Btrfs: close devices on all error paths in open_ctree() 



Fix a bug introduced by 7e662854 where we would leave devices busy on
certain error paths in open_ctree().  fs_info is guaranteed to be
non-NULL now so it's safe to dereference it on all error paths.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 4d34b278

fs/btrfs/disk-io.c

+3 −4
Original line number Diff line number Diff line
@@ -2460,21 +2460,20 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
	btrfs_stop_workers(&fs_info->caching_workers);

fail_alloc:

fail_iput:

	btrfs_mapping_tree_free(&fs_info->mapping_tree);



	invalidate_inode_pages2(fs_info->btree_inode->i_mapping);

	iput(fs_info->btree_inode);



	btrfs_close_devices(fs_info->fs_devices);

	btrfs_mapping_tree_free(&fs_info->mapping_tree);

fail_bdi:

	bdi_destroy(&fs_info->bdi);

fail_srcu:

	cleanup_srcu_struct(&fs_info->subvol_srcu);

fail:

	btrfs_close_devices(fs_info->fs_devices);

	free_fs_info(fs_info);

	return ERR_PTR(err);



recovery_tree_root:



	if (!btrfs_test_opt(tree_root, RECOVERY))

		goto fail_tree_roots;