From 6366e361fe33a63a7dda712fb415640fa6d3ba16 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Thu, 18 Jun 2020 00:56:19 -0400 Subject: [PATCH] test/nvme_arbitration: use extended block size API spdk_nvme_ns_get_extended_sector_size() is same with spdk_nvme_ns_get_sector_size() if the drive wasn't formatted to extended LBA format, but if the drive was using extended LBA format, it will cause error without this patch. Change-Id: Ie845453949c65a9f1d1370227fe3363648f0d0d9 Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2934 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk --- examples/nvme/arbitration/arbitration.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/nvme/arbitration/arbitration.c b/examples/nvme/arbitration/arbitration.c index c63dc8c83..444076041 100644 --- a/examples/nvme/arbitration/arbitration.c +++ b/examples/nvme/arbitration/arbitration.c @@ -159,11 +159,12 @@ register_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns *ns) cdata = spdk_nvme_ctrlr_get_data(ctrlr); if (spdk_nvme_ns_get_size(ns) < g_arbitration.io_size_bytes || - spdk_nvme_ns_get_sector_size(ns) > g_arbitration.io_size_bytes) { + spdk_nvme_ns_get_extended_sector_size(ns) > g_arbitration.io_size_bytes || + g_arbitration.io_size_bytes % spdk_nvme_ns_get_extended_sector_size(ns)) { printf("WARNING: controller %-20.20s (%-20.20s) ns %u has invalid " "ns size %" PRIu64 " / block size %u for I/O size %u\n", cdata->mn, cdata->sn, spdk_nvme_ns_get_id(ns), - spdk_nvme_ns_get_size(ns), spdk_nvme_ns_get_sector_size(ns), + spdk_nvme_ns_get_size(ns), spdk_nvme_ns_get_extended_sector_size(ns), g_arbitration.io_size_bytes); return; }