Commit 6c4a07ec authored by Ziye Yang's avatar Ziye Yang Committed by Daniel Verkamp
Browse files

scsi: change spdk_put_task to spdk_scsi_task_put 



Change-Id: I2598627523b2a78b68d7e7fdadbb7d8ef44592b9
Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
parent 19dff91a

include/spdk/scsi.h

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ int spdk_scsi_port_construct(struct spdk_scsi_port *port, uint64_t id, 


void spdk_scsi_task_construct(struct spdk_scsi_task *task, uint32_t *owner_task_ctr,

			      struct spdk_scsi_task *parent);

void spdk_put_task(struct spdk_scsi_task *task);

void spdk_scsi_task_put(struct spdk_scsi_task *task);

void spdk_scsi_task_alloc_data(struct spdk_scsi_task *task, uint32_t alloc_len,

			       uint8_t **data);

int spdk_scsi_task_build_sense_data(struct spdk_scsi_task *task, int sk, int asc,

lib/iscsi/task.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ struct spdk_iscsi_task { 
static inline void

spdk_iscsi_task_put(struct spdk_iscsi_task *task)

{

	spdk_put_task(&task->scsi);

	spdk_scsi_task_put(&task->scsi);

}



static inline struct spdk_iscsi_pdu *

lib/scsi/task.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <rte_malloc.h>



void

spdk_put_task(struct spdk_scsi_task *task)

spdk_scsi_task_put(struct spdk_scsi_task *task)

{

	if (!task) {

		return;
@@ -51,7 +51,7 @@ spdk_put_task(struct spdk_scsi_task *task) 
		struct spdk_bdev_io *bdev_io = task->blockdev_io;



		if (task->parent) {

			spdk_put_task(task->parent);

			spdk_scsi_task_put(task->parent);

			task->parent = NULL;

		}

test/lib/iscsi/common.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ spdk_iscsi_task_get(uint32_t *owner_task_ctr, struct spdk_iscsi_task *parent) 
}



void

spdk_put_task(struct spdk_scsi_task *task)

spdk_scsi_task_put(struct spdk_scsi_task *task)

{

	free(task);

}

test/lib/scsi/dev/dev_ut.c

+5 −5
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ spdk_get_task(uint32_t *owner_task_ctr) 
}



void

spdk_put_task(struct spdk_scsi_task *task)

spdk_scsi_task_put(struct spdk_scsi_task *task)

{

	g_task_count--;
@@ -250,7 +250,7 @@ dev_queue_mgmt_task_success(void) 


	spdk_scsi_dev_queue_mgmt_task(dev, task);



	spdk_put_task(task);

	spdk_scsi_task_put(task);



	spdk_scsi_dev_destruct(dev);

}
@@ -272,7 +272,7 @@ dev_queue_task_success(void) 


	spdk_scsi_dev_queue_task(dev, task);



	spdk_put_task(task);

	spdk_scsi_task_put(task);



	spdk_scsi_dev_destruct(dev);

}
@@ -293,8 +293,8 @@ dev_stop_success(void) 
	/* Enqueue the tasks into dev->task_mgmt_submit_queue*/

	spdk_scsi_dev_queue_mgmt_task(&dev, task_mgmt);



	spdk_put_task(task);

	spdk_put_task(task_mgmt);

	spdk_scsi_task_put(task);

	spdk_scsi_task_put(task_mgmt);

}



static void