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

bdev: return error code when try to add duplicate nvme bdev.

Browse Source 
Change-Id: Ifdab98324481b110442b08f03669b697d728b851
Signed-off-by: Cunyin Chang <cunyin.chang@intel.com>
This commit is contained in:
Cunyin Chang 2016-10-14 02:32:25 +08:00 committed by Jim Harris
parent d7635243b9
commit 076c7d5953
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/bdev/nvme/blockdev_nvme.c
View File

@ -60,6 +60,7 @@ struct nvme_device {
* target for CONTROLLER IDENTIFY command during initialization * target for CONTROLLER IDENTIFY command during initialization
*/ */
struct spdk_nvme_ctrlr *ctrlr; struct spdk_nvme_ctrlr *ctrlr;
struct spdk_pci_device *pci_dev;
/** linked list pointer for device list */ /** linked list pointer for device list */
TAILQ_ENTRY(nvme_device) tailq; TAILQ_ENTRY(nvme_device) tailq;
@ -387,6 +388,7 @@ attach_cb(void *cb_ctx, struct spdk_pci_device *pci_dev, struct spdk_nvme_ctrlr
} }
dev->ctrlr = ctrlr; dev->ctrlr = ctrlr;
dev->pci_dev = pci_dev;
dev->id = nvme_controller_index++; dev->id = nvme_controller_index++;
nvme_ctrlr_initialize_blockdevs(dev->ctrlr, nvme_luns_per_ns, dev->id); nvme_ctrlr_initialize_blockdevs(dev->ctrlr, nvme_luns_per_ns, dev->id);
@ -399,9 +401,29 @@ attach_cb(void *cb_ctx, struct spdk_pci_device *pci_dev, struct spdk_nvme_ctrlr
} }
} }
static bool
blockdev_nvme_exist(struct nvme_probe_ctx *ctx)
{
int i;
struct nvme_device *nvme_dev;
for (i = 0; i < ctx->num_whitelist_controllers; i++) {
TAILQ_FOREACH(nvme_dev, &g_nvme_devices, tailq) {
if (spdk_pci_device_compare_addr(nvme_dev->pci_dev, &ctx->whitelist[i])) {
return true;
}
}
}
return false;
}
int int
spdk_bdev_nvme_create(struct nvme_probe_ctx *ctx) spdk_bdev_nvme_create(struct nvme_probe_ctx *ctx)
{ {
if (blockdev_nvme_exist(ctx)) {
return -1;
}
if (spdk_nvme_probe(ctx, probe_cb, attach_cb, NULL)) { if (spdk_nvme_probe(ctx, probe_cb, attach_cb, NULL)) {
return -1; return -1;
} }