update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / drivers / bus / vdev / vdev.c

diff --git a/ceph/src/spdk/dpdk/drivers/bus/vdev/vdev.c b/ceph/src/spdk/dpdk/drivers/bus/vdev/vdev.c
index 04f76a63f1576464b68e880cb0412eef73db5a93..a89ea23530641c88244b45de9de2d6b5945a77e9 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/bus/vdev/vdev.c
+++ b/ceph/src/spdk/dpdk/drivers/bus/vdev/vdev.c
@@ -409,6 +409,10 @@ vdev_scan(void)
 
        if (rte_mp_action_register(VDEV_MP_KEY, vdev_action) < 0 &&
            rte_errno != EEXIST) {
+               /* for primary, unsupported IPC is not an error */
+               if (rte_eal_process_type() == RTE_PROC_PRIMARY &&
+                               rte_errno == ENOTSUP)
+                       goto scan;
                VDEV_LOG(ERR, "Failed to add vdev mp action");
                return -1;
        }
@@ -436,6 +440,7 @@ vdev_scan(void)
                /* Fall through to allow private vdevs in secondary process */
        }
 
+scan:
        /* call custom scan callbacks if any */
        rte_spinlock_lock(&vdev_custom_scan_lock);
        TAILQ_FOREACH(custom_scan, &vdev_custom_scans, next) {