Imported Upstream version 17.05

[deb_dpdk.git] / lib / librte_mempool / rte_mempool.c

diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
index aa513b9..f65310f 100644 (file)
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -818,7 +818,6 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size,
                goto exit_unlock;
        }
        mp->mz = mz;
-       mp->socket_id = socket_id;
        mp->size = n;
        mp->flags = flags;
        mp->socket_id = socket_id;
@@ -869,6 +868,7 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
        rte_mempool_obj_cb_t *obj_init, void *obj_init_arg,
        int socket_id, unsigned flags)
 {
+       int ret;
        struct rte_mempool *mp;
 
        mp = rte_mempool_create_empty(name, n, elt_size, cache_size,
@@ -881,13 +881,16 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
         * set the correct index into the table of ops structs.
         */
        if ((flags & MEMPOOL_F_SP_PUT) && (flags & MEMPOOL_F_SC_GET))
-               rte_mempool_set_ops_byname(mp, "ring_sp_sc", NULL);
+               ret = rte_mempool_set_ops_byname(mp, "ring_sp_sc", NULL);
        else if (flags & MEMPOOL_F_SP_PUT)
-               rte_mempool_set_ops_byname(mp, "ring_sp_mc", NULL);
+               ret = rte_mempool_set_ops_byname(mp, "ring_sp_mc", NULL);
        else if (flags & MEMPOOL_F_SC_GET)
-               rte_mempool_set_ops_byname(mp, "ring_mp_sc", NULL);
+               ret = rte_mempool_set_ops_byname(mp, "ring_mp_sc", NULL);
        else
-               rte_mempool_set_ops_byname(mp, "ring_mp_mc", NULL);
+               ret = rte_mempool_set_ops_byname(mp, "ring_mp_mc", NULL);
+
+       if (ret)
+               goto fail;
 
        /* call the mempool priv initializer */
        if (mp_init)
@@ -998,12 +1001,6 @@ rte_mempool_in_use_count(const struct rte_mempool *mp)
        return mp->size - rte_mempool_avail_count(mp);
 }
 
-unsigned int
-rte_mempool_count(const struct rte_mempool *mp)
-{
-       return rte_mempool_avail_count(mp);
-}
-
 /* dump the cache status */
 static unsigned
 rte_mempool_dump_cache(FILE *f, const struct rte_mempool *mp)
@@ -1047,7 +1044,7 @@ void rte_mempool_check_cookies(const struct rte_mempool *mp,
        /* Force to drop the "const" attribute. This is done only when
         * DEBUG is enabled */
        tmp = (void *) obj_table_const;
-       obj_table = (void **) tmp;
+       obj_table = tmp;
 
        while (n--) {
                obj = obj_table[n];