diff --git a/lib/iscsi/iscsi.h b/lib/iscsi/iscsi.h
index 7ae45a9b4..37964999e 100644
--- a/lib/iscsi/iscsi.h
+++ b/lib/iscsi/iscsi.h
@@ -286,7 +286,7 @@ struct spdk_iscsi_globals {
 	struct rte_mempool *pdu_immediate_data_pool;
 	struct rte_mempool *pdu_data_out_pool;
 	struct rte_mempool *session_pool;
-	struct rte_mempool *task_pool;
+	struct spdk_mempool *task_pool;
 
 	struct spdk_iscsi_sess	**session;
 };
diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c
index baea37b43..0771dc006 100644
--- a/lib/iscsi/iscsi_subsystem.c
+++ b/lib/iscsi/iscsi_subsystem.c
@@ -390,12 +390,10 @@ spdk_iscsi_initialize_task_pool(void)
 	struct spdk_iscsi_globals *iscsi = &g_spdk_iscsi;
 
 	/* create scsi_task pool */
-	iscsi->task_pool = rte_mempool_create("SCSI_TASK_Pool",
-					      DEFAULT_TASK_POOL_SIZE,
-					      sizeof(struct spdk_iscsi_task),
-					      128, 0,
-					      NULL, NULL, NULL, NULL,
-					      SOCKET_ID_ANY, 0);
+	iscsi->task_pool = spdk_mempool_create("SCSI_TASK_Pool",
+					       DEFAULT_TASK_POOL_SIZE,
+					       sizeof(struct spdk_iscsi_task),
+					       128, SOCKET_ID_ANY);
 	if (!iscsi->task_pool) {
 		SPDK_ERRLOG("create task pool failed\n");
 		return -1;
@@ -483,7 +481,7 @@ spdk_iscsi_free_pools(void)
 	rte_mempool_free(iscsi->session_pool);
 	rte_mempool_free(iscsi->pdu_immediate_data_pool);
 	rte_mempool_free(iscsi->pdu_data_out_pool);
-	rte_mempool_free(iscsi->task_pool);
+	spdk_mempool_free(iscsi->task_pool);
 }
 
 void spdk_put_pdu(struct spdk_iscsi_pdu *pdu)
diff --git a/lib/iscsi/task.c b/lib/iscsi/task.c
index a7948f401..b8e075b85 100644
--- a/lib/iscsi/task.c
+++ b/lib/iscsi/task.c
@@ -32,9 +32,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <rte_config.h>
-#include <rte_mempool.h>
-
+#include "spdk/env.h"
 #include "spdk/log.h"
 #include "iscsi/conn.h"
 #include "iscsi/task.h"
@@ -47,7 +45,7 @@ spdk_iscsi_task_free(struct spdk_scsi_task *scsi_task)
 	spdk_iscsi_task_disassociate_pdu(task);
 	assert(task->conn->pending_task_cnt > 0);
 	task->conn->pending_task_cnt--;
-	rte_mempool_put(g_spdk_iscsi.task_pool, (void *)task);
+	spdk_mempool_put(g_spdk_iscsi.task_pool, (void *)task);
 }
 
 struct spdk_iscsi_task *
@@ -55,10 +53,9 @@ spdk_iscsi_task_get(struct spdk_iscsi_conn *conn, struct spdk_iscsi_task *parent
 		    spdk_scsi_task_cpl cpl_fn)
 {
 	struct spdk_iscsi_task *task;
-	int rc;
 
-	rc = rte_mempool_get(g_spdk_iscsi.task_pool, (void **)&task);
-	if ((rc < 0) || !task) {
+	task = spdk_mempool_get(g_spdk_iscsi.task_pool);
+	if (!task) {
 		SPDK_ERRLOG("Unable to get task\n");
 		abort();
 	}