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

module/raid: add helper for getting base bdev's slot 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 43293457

module/bdev/raid/bdev_raid.c

+2 −2
Original line number Diff line number Diff line
@@ -1400,7 +1400,7 @@ raid_bdev_remove_base_bdev_on_unquiesced(void *ctx, int status) 
	if (raid_bdev->sb) {

		struct raid_bdev_superblock *sb = raid_bdev->sb;

		struct raid_bdev_sb_base_bdev *sb_base_bdev = NULL;

		uint8_t slot = base_info - raid_bdev->base_bdev_info;

		uint8_t slot = raid_bdev_base_bdev_slot(base_info);

		uint8_t i;



		for (i = 0; i < sb->base_bdevs_size; i++) {
@@ -1432,7 +1432,7 @@ raid_bdev_channel_remove_base_bdev(struct spdk_io_channel_iter *i) 
	struct raid_base_bdev_info *base_info = spdk_io_channel_iter_get_ctx(i);

	struct spdk_io_channel *ch = spdk_io_channel_iter_get_channel(i);

	struct raid_bdev_io_channel *raid_ch = spdk_io_channel_get_ctx(ch);

	uint8_t idx = base_info - base_info->raid_bdev->base_bdev_info;

	uint8_t idx = raid_bdev_base_bdev_slot(base_info);



	SPDK_DEBUGLOG(bdev_raid, "slot: %u raid_ch: %p\n", idx, raid_ch);

module/bdev/raid/bdev_raid.h

+6 −0
Original line number Diff line number Diff line
@@ -297,6 +297,12 @@ void raid_bdev_queue_io_wait(struct raid_bdev_io *raid_io, struct spdk_bdev *bde 
void raid_bdev_io_complete(struct raid_bdev_io *raid_io, enum spdk_bdev_io_status status);

void raid_bdev_module_stop_done(struct raid_bdev *raid_bdev);



static inline uint8_t

raid_bdev_base_bdev_slot(struct raid_base_bdev_info *base_info)

{

	return base_info - base_info->raid_bdev->base_bdev_info;

}



/**

 * Raid bdev I/O read/write wrapper for spdk_bdev_readv_blocks_ext function.

 */

module/bdev/raid/bdev_raid_sb.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ raid_bdev_init_superblock(struct raid_bdev *raid_bdev) 
		sb_base_bdev->data_offset = base_info->data_offset;

		sb_base_bdev->data_size = base_info->data_size;

		sb_base_bdev->state = RAID_SB_BASE_BDEV_CONFIGURED;

		sb_base_bdev->slot = base_info - raid_bdev->base_bdev_info;

		sb_base_bdev->slot = raid_bdev_base_bdev_slot(base_info);

		sb_base_bdev++;

	}

}