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

Commit 7f59203a authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason
Browse files

Btrfs: check return value of open_bdev_exclusive properly 



Hit this problem while testing RAID1 failure stuff.  open_bdev_exclusive
returns ERR_PTR(), not NULL.  So change the return value properly.  This
is important if you accidently specify a device that doesn't exist when
trying to add a new device to an array, you will panic the box
dereferencing bdev.

Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent f48b9075

fs/btrfs/volumes.c

+2 −2
Original line number Diff line number Diff line
@@ -1434,8 +1434,8 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path) 
		return -EINVAL;



	bdev = open_bdev_exclusive(device_path, 0, root->fs_info->bdev_holder);

	if (!bdev)

		return -EIO;

	if (IS_ERR(bdev))

		return PTR_ERR(bdev);



	if (root->fs_info->fs_devices->seeding) {

		seeding_dev = 1;