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

Commit 16220c46 authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: add assertions where number of devices could go below 0 



In preparation to add helper function to deduce the num_devices with
replace running, use assert instead of BUG_ON or WARN_ON. The number of
devices would not normally drop to 0 due to other checks so the assert
is sufficient.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
[ update changelog, adjust the assert condition ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f8b00e0f

fs/btrfs/volumes.c

+2 −2
Original line number Diff line number Diff line
@@ -1868,7 +1868,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path, 
	num_devices = fs_devices->num_devices;

	btrfs_dev_replace_read_lock(&fs_info->dev_replace);

	if (btrfs_dev_replace_is_ongoing(&fs_info->dev_replace)) {

		WARN_ON(num_devices < 1);

		ASSERT(num_devices > 1);

		num_devices--;

	}

	btrfs_dev_replace_read_unlock(&fs_info->dev_replace);
@@ -3743,7 +3743,7 @@ int btrfs_balance(struct btrfs_fs_info *fs_info, 
	num_devices = fs_info->fs_devices->num_devices;

	btrfs_dev_replace_read_lock(&fs_info->dev_replace);

	if (btrfs_dev_replace_is_ongoing(&fs_info->dev_replace)) {

		BUG_ON(num_devices < 1);

		ASSERT(num_devices > 1);

		num_devices--;

	}

	btrfs_dev_replace_read_unlock(&fs_info->dev_replace);