Commit 973b0d62 authored by Artur Paszkiewicz's avatar Artur Paszkiewicz Committed by Tomasz Zawadzki
Browse files

module/raid: refactor loops to use iterator macro 



Change-Id: I2be8ee45e9584a450447fb7150350f568b1ce5c9
Signed-off-by: default avatarArtur Paszkiewicz <artur.paszkiewicz@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/18285


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 23850b03

module/bdev/raid/bdev_raid.c

+7 −10
Original line number Diff line number Diff line
@@ -687,8 +687,7 @@ static int 
raid_bdev_get_memory_domains(void *ctx, struct spdk_memory_domain **domains, int array_size)

{

	struct raid_bdev *raid_bdev = ctx;

	struct spdk_bdev *base_bdev;

	uint32_t i;

	struct raid_base_bdev_info *base_info;

	int domains_count = 0, rc = 0;



	if (raid_bdev->module->memory_domains_supported == false) {
@@ -698,12 +697,11 @@ raid_bdev_get_memory_domains(void *ctx, struct spdk_memory_domain **domains, int 
	spdk_spin_lock(&raid_bdev->base_bdev_lock);



	/* First loop to get the number of memory domains */

	for (i = 0; i < raid_bdev->num_base_bdevs; i++) {

		base_bdev = raid_bdev->base_bdev_info[i].bdev;

		if (base_bdev == NULL) {

	RAID_FOR_EACH_BASE_BDEV(raid_bdev, base_info) {

		if (base_info->bdev == NULL) {

			continue;

		}

		rc = spdk_bdev_get_memory_domains(base_bdev, NULL, 0);

		rc = spdk_bdev_get_memory_domains(base_info->bdev, NULL, 0);

		if (rc < 0) {

			goto out;

		}
@@ -714,12 +712,11 @@ raid_bdev_get_memory_domains(void *ctx, struct spdk_memory_domain **domains, int 
		goto out;

	}



	for (i = 0; i < raid_bdev->num_base_bdevs; i++) {

		base_bdev = raid_bdev->base_bdev_info[i].bdev;

		if (base_bdev == NULL) {

	RAID_FOR_EACH_BASE_BDEV(raid_bdev, base_info) {

		if (base_info->bdev == NULL) {

			continue;

		}

		rc = spdk_bdev_get_memory_domains(base_bdev, domains, array_size);

		rc = spdk_bdev_get_memory_domains(base_info->bdev, domains, array_size);

		if (rc < 0) {

			goto out;

		}