ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

module/raid: assign some values to variables to improve readability

Browse Source 
These will also be used in the next commit.

Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Change-Id: Iffd1a6e7fda2fc1688f3923777c085dcacc8613d
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/473453
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Artur Paszkiewicz 2019-11-06 12:59:01 +01:00 committed by Tomasz Zawadzki
parent d3a04643bf
commit 235cc2c956
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
module/bdev/raid/bdev_raid.c
View File

@ -365,6 +365,8 @@ raid_bdev_submit_reset_request(struct raid_bdev_io *raid_io)
struct raid_bdev *raid_bdev; struct raid_bdev *raid_bdev;
int ret; int ret;
uint8_t i; uint8_t i;
struct raid_base_bdev_info *base_info;
struct spdk_io_channel *base_ch;
bdev_io = spdk_bdev_io_from_ctx(raid_io); bdev_io = spdk_bdev_io_from_ctx(raid_io);
raid_bdev = raid_io->raid_bdev; raid_bdev = raid_io->raid_bdev;
@ -373,8 +375,9 @@ raid_bdev_submit_reset_request(struct raid_bdev_io *raid_io)
while (raid_io->base_bdev_io_submitted < raid_bdev->num_base_bdevs) { while (raid_io->base_bdev_io_submitted < raid_bdev->num_base_bdevs) {
i = raid_io->base_bdev_io_submitted; i = raid_io->base_bdev_io_submitted;
ret = spdk_bdev_reset(raid_bdev->base_bdev_info[i].desc, base_info = &raid_bdev->base_bdev_info[i];
raid_io->raid_ch->base_channel[i], base_ch = raid_io->raid_ch->base_channel[i];
ret = spdk_bdev_reset(base_info->desc, base_ch,
raid_bdev_base_io_completion, bdev_io); raid_bdev_base_io_completion, bdev_io);
if (ret == 0) { if (ret == 0) {
raid_io->base_bdev_io_submitted++; raid_io->base_bdev_io_submitted++;

22
module/bdev/raid/raid0.c
View File

@ -91,6 +91,8 @@ raid0_submit_rw_request(struct raid_bdev_io *raid_io)
int ret = 0; int ret = 0;
uint64_t start_strip; uint64_t start_strip;
uint64_t end_strip; uint64_t end_strip;
struct raid_base_bdev_info *base_info;
struct spdk_io_channel *base_ch;
start_strip = bdev_io->u.bdev.offset_blocks >> raid_bdev->strip_size_shift; start_strip = bdev_io->u.bdev.offset_blocks >> raid_bdev->strip_size_shift;
end_strip = (bdev_io->u.bdev.offset_blocks + bdev_io->u.bdev.num_blocks - 1) >> end_strip = (bdev_io->u.bdev.offset_blocks + bdev_io->u.bdev.num_blocks - 1) >>
@ -107,7 +109,8 @@ raid0_submit_rw_request(struct raid_bdev_io *raid_io)
offset_in_strip = bdev_io->u.bdev.offset_blocks & (raid_bdev->strip_size - 1); offset_in_strip = bdev_io->u.bdev.offset_blocks & (raid_bdev->strip_size - 1);
pd_lba = (pd_strip << raid_bdev->strip_size_shift) + offset_in_strip; pd_lba = (pd_strip << raid_bdev->strip_size_shift) + offset_in_strip;
pd_blocks = bdev_io->u.bdev.num_blocks; pd_blocks = bdev_io->u.bdev.num_blocks;
if (raid_bdev->base_bdev_info[pd_idx].desc == NULL) { base_info = &raid_bdev->base_bdev_info[pd_idx];
if (base_info->desc == NULL) {
SPDK_ERRLOG("base bdev desc null for pd_idx %u\n", pd_idx); SPDK_ERRLOG("base bdev desc null for pd_idx %u\n", pd_idx);
assert(0); assert(0);
} }
@ -119,15 +122,14 @@ raid0_submit_rw_request(struct raid_bdev_io *raid_io)
*/ */
assert(raid_ch != NULL); assert(raid_ch != NULL);
assert(raid_ch->base_channel); assert(raid_ch->base_channel);
base_ch = raid_ch->base_channel[pd_idx];
if (bdev_io->type == SPDK_BDEV_IO_TYPE_READ) { if (bdev_io->type == SPDK_BDEV_IO_TYPE_READ) {
ret = spdk_bdev_readv_blocks(raid_bdev->base_bdev_info[pd_idx].desc, ret = spdk_bdev_readv_blocks(base_info->desc, base_ch,
raid_ch->base_channel[pd_idx],
bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,
pd_lba, pd_blocks, raid0_bdev_io_completion, pd_lba, pd_blocks, raid0_bdev_io_completion,
bdev_io); bdev_io);
} else if (bdev_io->type == SPDK_BDEV_IO_TYPE_WRITE) { } else if (bdev_io->type == SPDK_BDEV_IO_TYPE_WRITE) {
ret = spdk_bdev_writev_blocks(raid_bdev->base_bdev_info[pd_idx].desc, ret = spdk_bdev_writev_blocks(base_info->desc, base_ch,
raid_ch->base_channel[pd_idx],
bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,
pd_lba, pd_blocks, raid0_bdev_io_completion, pd_lba, pd_blocks, raid0_bdev_io_completion,
bdev_io); bdev_io);
@ -286,6 +288,8 @@ raid0_submit_null_payload_request(struct raid_bdev_io *raid_io)
struct raid_bdev *raid_bdev; struct raid_bdev *raid_bdev;
struct raid_bdev_io_range io_range; struct raid_bdev_io_range io_range;
int ret; int ret;
struct raid_base_bdev_info *base_info;
struct spdk_io_channel *base_ch;
bdev_io = spdk_bdev_io_from_ctx(raid_io); bdev_io = spdk_bdev_io_from_ctx(raid_io);
raid_bdev = raid_io->raid_bdev; raid_bdev = raid_io->raid_bdev;
@ -305,20 +309,20 @@ raid0_submit_null_payload_request(struct raid_bdev_io *raid_io)
* It is possible that index of start_disk is larger than end_disk's. * It is possible that index of start_disk is larger than end_disk's.
*/ */
disk_idx = (io_range.start_disk + raid_io->base_bdev_io_submitted) % raid_bdev->num_base_bdevs; disk_idx = (io_range.start_disk + raid_io->base_bdev_io_submitted) % raid_bdev->num_base_bdevs;
base_info = &raid_bdev->base_bdev_info[disk_idx];
base_ch = raid_io->raid_ch->base_channel[disk_idx];
_raid0_split_io_range(&io_range, disk_idx, &offset_in_disk, &nblocks_in_disk); _raid0_split_io_range(&io_range, disk_idx, &offset_in_disk, &nblocks_in_disk);
switch (bdev_io->type) { switch (bdev_io->type) {
case SPDK_BDEV_IO_TYPE_UNMAP: case SPDK_BDEV_IO_TYPE_UNMAP:
ret = spdk_bdev_unmap_blocks(raid_bdev->base_bdev_info[disk_idx].desc, ret = spdk_bdev_unmap_blocks(base_info->desc, base_ch,
raid_io->raid_ch->base_channel[disk_idx],
offset_in_disk, nblocks_in_disk, offset_in_disk, nblocks_in_disk,
raid_bdev_base_io_completion, bdev_io); raid_bdev_base_io_completion, bdev_io);
break; break;
case SPDK_BDEV_IO_TYPE_FLUSH: case SPDK_BDEV_IO_TYPE_FLUSH:
ret = spdk_bdev_flush_blocks(raid_bdev->base_bdev_info[disk_idx].desc, ret = spdk_bdev_flush_blocks(base_info->desc, base_ch,
raid_io->raid_ch->base_channel[disk_idx],
offset_in_disk, nblocks_in_disk, offset_in_disk, nblocks_in_disk,
raid_bdev_base_io_completion, bdev_io); raid_bdev_base_io_completion, bdev_io);
break; break;