From: Anand Jain Date: Fri, 10 Aug 2018 05:53:20 +0000 (+0800) Subject: btrfs: add assertions where number of devices could go below 0 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=16220c467ad34c8f103566a79ac047ed391f51f2;p=linux.git 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: Anand Jain Reviewed-by: David Sterba [ update changelog, adjust the assert condition ] Signed-off-by: David Sterba --- diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index f4405e430da6e..3946fe951b60c 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -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);