import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / dpdk / lib / librte_rawdev / rte_rawdev.c

diff --git a/ceph/src/spdk/dpdk/lib/librte_rawdev/rte_rawdev.c b/ceph/src/spdk/dpdk/lib/librte_rawdev/rte_rawdev.c
index 62b6b97ef3130e7e5daff6b5ab139d7376911556..2b2f45d7c2967ecec20f288c5783c47d1f6e2d54 100644 (file)
--- a/ceph/src/spdk/dpdk/lib/librte_rawdev/rte_rawdev.c
+++ b/ceph/src/spdk/dpdk/lib/librte_rawdev/rte_rawdev.c
@@ -13,6 +13,7 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 
+#include <rte_string_fns.h>
 #include <rte_byteorder.h>
 #include <rte_log.h>
 #include <rte_debug.h>
@@ -35,21 +36,19 @@
 /* dynamic log identifier */
 int librawdev_logtype;
 
-struct rte_rawdev rte_rawdevices[RTE_RAWDEV_MAX_DEVS];
+static struct rte_rawdev rte_rawdevices[RTE_RAWDEV_MAX_DEVS];
 
-struct rte_rawdev *rte_rawdevs = &rte_rawdevices[0];
+struct rte_rawdev *rte_rawdevs = rte_rawdevices;
 
 static struct rte_rawdev_global rawdev_globals = {
        .nb_devs                = 0
 };
 
-struct rte_rawdev_global *rte_rawdev_globals = &rawdev_globals;
-
 /* Raw device, northbound API implementation */
 uint8_t
 rte_rawdev_count(void)
 {
-       return rte_rawdev_globals->nb_devs;
+       return rawdev_globals.nb_devs;
 }
 
 uint16_t
@@ -60,7 +59,7 @@ rte_rawdev_get_dev_id(const char *name)
        if (!name)
                return -EINVAL;
 
-       for (i = 0; i < rte_rawdev_globals->nb_devs; i++)
+       for (i = 0; i < rawdev_globals.nb_devs; i++)
                if ((strcmp(rte_rawdevices[i].name, name)
                                == 0) &&
                                (rte_rawdevices[i].attached ==
@@ -510,7 +509,7 @@ rte_rawdev_pmd_allocate(const char *name, size_t dev_priv_size, int socket_id)
        rawdev->dev_id = dev_id;
        rawdev->socket_id = socket_id;
        rawdev->started = 0;
-       snprintf(rawdev->name, RTE_RAWDEV_NAME_MAX_LEN, "%s", name);
+       strlcpy(rawdev->name, name, RTE_RAWDEV_NAME_MAX_LEN);
 
        rawdev->attached = RTE_RAWDEV_ATTACHED;
        rawdev_globals.nb_devs++;