Commit 0ea6e36a authored by Artur Paszkiewicz's avatar Artur Paszkiewicz Committed by Tomasz Zawadzki
Browse files

module/raid: simplify raid state string conversions 



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


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarMateusz Kozlowski <mateusz.kozlowski@solidigm.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent 005428e1

module/bdev/raid/bdev_raid.c

+12 −20
Original line number Diff line number Diff line
@@ -855,14 +855,11 @@ static struct { 
	{ }

};



static struct {

	const char *name;

	enum raid_bdev_state value;

} g_raid_state_names[] = {

	{ "online", RAID_BDEV_STATE_ONLINE },

	{ "configuring", RAID_BDEV_STATE_CONFIGURING },

	{ "offline", RAID_BDEV_STATE_OFFLINE },

	{ }

const char *g_raid_state_names[] = {

	[RAID_BDEV_STATE_ONLINE]	= "online",

	[RAID_BDEV_STATE_CONFIGURING]	= "configuring",

	[RAID_BDEV_STATE_OFFLINE]	= "offline",

	[RAID_BDEV_STATE_MAX]		= NULL

};



/* We have to use the typedef in the function declaration to appease astyle. */
@@ -906,28 +903,23 @@ raid_bdev_str_to_state(const char *str) 


	assert(str != NULL);



	for (i = 0; g_raid_state_names[i].name != NULL; i++) {

		if (strcasecmp(g_raid_state_names[i].name, str) == 0) {

			return g_raid_state_names[i].value;

	for (i = 0; i < RAID_BDEV_STATE_MAX; i++) {

		if (strcasecmp(g_raid_state_names[i], str) == 0) {

			break;

		}

	}



	return RAID_BDEV_STATE_MAX;

	return i;

}



const char *

raid_bdev_state_to_str(enum raid_bdev_state state)

{

	unsigned int i;



	for (i = 0; g_raid_state_names[i].name != NULL; i++) {

		if (g_raid_state_names[i].value == state) {

			return g_raid_state_names[i].name;

		}

	if (state >= RAID_BDEV_STATE_MAX) {

		return "";

	}



	assert(false);

	return "";

	return g_raid_state_names[state];

}



/*