Commit 8f06e952 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

bdev/raid: Refactor raid_bdev_remove_base_bdev 



Put the core operation into the loop without using the found flag.

Change-Id: I6509988f11a87e7a7f0ffbad46a090837ee9de20
Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/430512


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 935c0b47

lib/bdev/raid/bdev_raid.c

+23 −31
Original line number Diff line number Diff line
@@ -1459,7 +1459,6 @@ raid_bdev_remove_base_bdev(void *ctx) 
	struct spdk_bdev	*base_bdev = ctx;

	struct raid_bdev	*raid_bdev;

	uint16_t		i;

	bool                      found = false;



	SPDK_DEBUGLOG(SPDK_LOG_BDEV_RAID, "raid_bdev_remove_base_bdev\n");
@@ -1467,19 +1466,6 @@ raid_bdev_remove_base_bdev(void *ctx) 
	TAILQ_FOREACH(raid_bdev, &g_spdk_raid_bdev_list, global_link) {

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

			if (raid_bdev->base_bdev_info[i].bdev == base_bdev) {

				found = true;

				break;

			}

		}

		if (found == true) {

			break;

		}

	}



	if (found == false) {

		SPDK_ERRLOG("bdev to remove '%s' not found\n", base_bdev->name);

		return;

	}



				assert(raid_bdev->base_bdev_info[i].desc);

				raid_bdev->base_bdev_info[i].remove_scheduled = true;
@@ -1487,18 +1473,24 @@ raid_bdev_remove_base_bdev(void *ctx) 
				if (raid_bdev->destruct_called == true ||

				    raid_bdev->state == RAID_BDEV_STATE_CONFIGURING) {

					/*

		 * As raid bdev is not registered yet or already unregistered, so cleanup

		 * should be done here itself

					 * As raid bdev is not registered yet or already unregistered,

					 * so cleanup should be done here itself.

					 */

					raid_bdev_free_base_bdev_resource(raid_bdev, i);

					if (raid_bdev->num_base_bdevs_discovered == 0) {

			/* Since there is no base bdev for this raid, so free the raid device */

						/* There is no base bdev for this raid, so free the raid device. */

						raid_bdev_cleanup(raid_bdev);

						return;

					}

				}



				raid_bdev_deconfigure(raid_bdev);

				return;

			}

		}

	}



	SPDK_ERRLOG("bdev to remove '%s' not found\n", base_bdev->name);

}



/*