Commit 18dec401 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

lib/scsi: Remove spdk_ prefix from internal APIs 



Remove spdk_ prefix from the name of internal APIs.

Add single underscore as the prefix of the function name to the
private functions if we see any conflict as a result of this change.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: If0eabffbdb750db02866c1aa2b29b0c89fab1040
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1824


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 6ee4bdab

lib/scsi/dev.c

+11 −11
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
static struct spdk_scsi_dev g_devs[SPDK_SCSI_MAX_DEVS];



struct spdk_scsi_dev *

spdk_scsi_dev_get_list(void)

scsi_dev_get_list(void)

{

	return g_devs;

}
@@ -110,7 +110,7 @@ spdk_scsi_dev_destruct(struct spdk_scsi_dev *dev, 
		 * LUN will remove itself from this dev when all outstanding IO

		 * is done. When no more LUNs, dev will be deleted.

		 */

		spdk_scsi_lun_destruct(dev->lun[i]);

		scsi_lun_destruct(dev->lun[i]);

		lun_cnt++;

	}
@@ -158,7 +158,7 @@ spdk_scsi_dev_add_lun(struct spdk_scsi_dev *dev, const char *bdev_name, int lun_ 
		}

	}



	lun = spdk_scsi_lun_construct(bdev, hotremove_cb, hotremove_ctx);

	lun = scsi_lun_construct(bdev, hotremove_cb, hotremove_ctx);

	if (lun == NULL) {

		return -1;

	}
@@ -262,7 +262,7 @@ spdk_scsi_dev_queue_mgmt_task(struct spdk_scsi_dev *dev, 
{

	assert(task != NULL);



	spdk_scsi_lun_execute_mgmt_task(task->lun, task);

	scsi_lun_execute_mgmt_task(task->lun, task);

}



void
@@ -271,7 +271,7 @@ spdk_scsi_dev_queue_task(struct spdk_scsi_dev *dev, 
{

	assert(task != NULL);



	spdk_scsi_lun_execute_task(task->lun, task);

	scsi_lun_execute_task(task->lun, task);

}



static struct spdk_scsi_port *
@@ -311,7 +311,7 @@ spdk_scsi_dev_add_port(struct spdk_scsi_dev *dev, uint64_t id, const char *name) 
		return -1;

	}



	rc = spdk_scsi_port_construct(port, id, dev->num_ports, name);

	rc = scsi_port_construct(port, id, dev->num_ports, name);

	if (rc != 0) {

		return rc;

	}
@@ -331,7 +331,7 @@ spdk_scsi_dev_delete_port(struct spdk_scsi_dev *dev, uint64_t id) 
		return -1;

	}



	spdk_scsi_port_destruct(port);

	scsi_port_destruct(port);



	dev->num_ports--;
@@ -365,7 +365,7 @@ spdk_scsi_dev_free_io_channels(struct spdk_scsi_dev *dev) 
		if (dev->lun[i] == NULL) {

			continue;

		}

		_spdk_scsi_lun_free_io_channel(dev->lun[i]);

		scsi_lun_free_io_channel(dev->lun[i]);

	}

}
@@ -378,7 +378,7 @@ spdk_scsi_dev_allocate_io_channels(struct spdk_scsi_dev *dev) 
		if (dev->lun[i] == NULL) {

			continue;

		}

		rc = _spdk_scsi_lun_allocate_io_channel(dev->lun[i]);

		rc = scsi_lun_allocate_io_channel(dev->lun[i]);

		if (rc < 0) {

			spdk_scsi_dev_free_io_channels(dev);

			return -1;
@@ -426,8 +426,8 @@ spdk_scsi_dev_has_pending_tasks(const struct spdk_scsi_dev *dev, 


	for (i = 0; i < SPDK_SCSI_DEV_MAX_LUN; ++i) {

		if (dev->lun[i] &&

		    (spdk_scsi_lun_has_pending_tasks(dev->lun[i], initiator_port) ||

		     spdk_scsi_lun_has_pending_mgmt_tasks(dev->lun[i], initiator_port))) {

		    (scsi_lun_has_pending_tasks(dev->lun[i], initiator_port) ||

		     scsi_lun_has_pending_mgmt_tasks(dev->lun[i], initiator_port))) {

			return true;

		}

	}

lib/scsi/lun.c

+30 −30
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ 
#include "spdk/likely.h"



static void scsi_lun_execute_tasks(struct spdk_scsi_lun *lun);

static void scsi_lun_execute_mgmt_task(struct spdk_scsi_lun *lun);

static void _scsi_lun_execute_mgmt_task(struct spdk_scsi_lun *lun);



void

spdk_scsi_lun_complete_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task)

scsi_lun_complete_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task)

{

	if (lun) {

		TAILQ_REMOVE(&lun->tasks, task, scsi_link);
@@ -61,11 +61,11 @@ scsi_lun_complete_mgmt_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *ta 
	task->cpl_fn(task);



	/* Try to execute the first pending mgmt task if it exists. */

	scsi_lun_execute_mgmt_task(lun);

	_scsi_lun_execute_mgmt_task(lun);

}



static bool

scsi_lun_has_pending_mgmt_tasks(const struct spdk_scsi_lun *lun)

_scsi_lun_has_pending_mgmt_tasks(const struct spdk_scsi_lun *lun)

{

	return !TAILQ_EMPTY(&lun->pending_mgmt_tasks);

}
@@ -77,7 +77,7 @@ scsi_lun_has_outstanding_mgmt_tasks(const struct spdk_scsi_lun *lun) 
}



static bool

scsi_lun_has_pending_tasks(const struct spdk_scsi_lun *lun)

_scsi_lun_has_pending_tasks(const struct spdk_scsi_lun *lun)

{

	return !TAILQ_EMPTY(&lun->pending_tasks);

}
@@ -105,7 +105,7 @@ scsi_lun_reset_check_outstanding_tasks(void *arg) 
}



void

spdk_scsi_lun_complete_reset_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task)

scsi_lun_complete_reset_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task)

{

	if (task->status == SPDK_SCSI_STATUS_GOOD) {

		if (scsi_lun_has_outstanding_tasks(lun)) {
@@ -127,7 +127,7 @@ scsi_lun_append_mgmt_task(struct spdk_scsi_lun *lun, 
}



static void

scsi_lun_execute_mgmt_task(struct spdk_scsi_lun *lun)

_scsi_lun_execute_mgmt_task(struct spdk_scsi_lun *lun)

{

	struct spdk_scsi_task *task;
@@ -163,7 +163,7 @@ scsi_lun_execute_mgmt_task(struct spdk_scsi_lun *lun) 
		break;



	case SPDK_SCSI_TASK_FUNC_LUN_RESET:

		spdk_bdev_scsi_reset(task);

		bdev_scsi_reset(task);

		return;



	default:
@@ -181,11 +181,11 @@ scsi_lun_execute_mgmt_task(struct spdk_scsi_lun *lun) 
}



void

spdk_scsi_lun_execute_mgmt_task(struct spdk_scsi_lun *lun,

scsi_lun_execute_mgmt_task(struct spdk_scsi_lun *lun,

			   struct spdk_scsi_task *task)

{

	scsi_lun_append_mgmt_task(lun, task);

	scsi_lun_execute_mgmt_task(lun);

	_scsi_lun_execute_mgmt_task(lun);

}



static void
@@ -198,12 +198,12 @@ _scsi_lun_execute_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task) 
	TAILQ_INSERT_TAIL(&lun->tasks, task, scsi_link);

	if (!lun->removed) {

		/* Check the command is allowed or not when reservation is exist */

		rc = spdk_scsi_pr_check(task);

		rc = scsi_pr_check(task);

		if (spdk_unlikely(rc < 0)) {

			/* Reservation Conflict */

			rc = SPDK_SCSI_TASK_COMPLETE;

		} else {

			rc = spdk_bdev_scsi_execute(task);

			rc = bdev_scsi_execute(task);

		}

	} else {

		spdk_scsi_task_process_abort(task);
@@ -215,7 +215,7 @@ _scsi_lun_execute_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task) 
		break;



	case SPDK_SCSI_TASK_COMPLETE:

		spdk_scsi_lun_complete_task(lun, task);

		scsi_lun_complete_task(lun, task);

		break;



	default:
@@ -241,14 +241,14 @@ scsi_lun_execute_tasks(struct spdk_scsi_lun *lun) 
}



void

spdk_scsi_lun_execute_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task)

scsi_lun_execute_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task)

{

	if (spdk_unlikely(scsi_lun_has_pending_mgmt_tasks(lun))) {

	if (spdk_unlikely(_scsi_lun_has_pending_mgmt_tasks(lun))) {

		/* Add the IO task to pending list and wait for completion of

		 * existing mgmt tasks.

		 */

		scsi_lun_append_task(lun, task);

	} else if (spdk_unlikely(scsi_lun_has_pending_tasks(lun))) {

	} else if (spdk_unlikely(_scsi_lun_has_pending_tasks(lun))) {

		/* If there is any pending IO task, append the IO task to the

		 * tail of the pending list, and then execute all pending IO tasks

		 * from the head to submit IO tasks in order.
@@ -398,7 +398,7 @@ scsi_lun_hot_remove(void *remove_ctx) 
 * \return NULL if bdev == NULL

 * \return pointer to the new spdk_scsi_lun object otherwise

 */

struct spdk_scsi_lun *spdk_scsi_lun_construct(struct spdk_bdev *bdev,

struct spdk_scsi_lun *scsi_lun_construct(struct spdk_bdev *bdev,

		void (*hotremove_cb)(const struct spdk_scsi_lun *, void *),

		void *hotremove_ctx)

{
@@ -442,7 +442,7 @@ struct spdk_scsi_lun *spdk_scsi_lun_construct(struct spdk_bdev *bdev, 
}



void

spdk_scsi_lun_destruct(struct spdk_scsi_lun *lun)

scsi_lun_destruct(struct spdk_scsi_lun *lun)

{

	scsi_lun_hot_remove(lun);

}
@@ -481,7 +481,7 @@ spdk_scsi_lun_close(struct spdk_scsi_lun_desc *desc) 
}



int

_spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_lun *lun)

scsi_lun_allocate_io_channel(struct spdk_scsi_lun *lun)

{

	if (lun->io_channel != NULL) {

		if (spdk_get_thread() == spdk_io_channel_get_thread(lun->io_channel)) {
@@ -502,7 +502,7 @@ _spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_lun *lun) 
}



void

_spdk_scsi_lun_free_io_channel(struct spdk_scsi_lun *lun)

scsi_lun_free_io_channel(struct spdk_scsi_lun *lun)

{

	if (lun->io_channel == NULL) {

		return;
@@ -525,7 +525,7 @@ spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_lun_desc *desc) 
{

	struct spdk_scsi_lun *lun = desc->lun;



	return _spdk_scsi_lun_allocate_io_channel(lun);

	return scsi_lun_allocate_io_channel(lun);

}



void
@@ -533,7 +533,7 @@ spdk_scsi_lun_free_io_channel(struct spdk_scsi_lun_desc *desc) 
{

	struct spdk_scsi_lun *lun = desc->lun;



	_spdk_scsi_lun_free_io_channel(lun);

	scsi_lun_free_io_channel(lun);

}



int
@@ -555,13 +555,13 @@ spdk_scsi_lun_get_dev(const struct spdk_scsi_lun *lun) 
}



bool

spdk_scsi_lun_has_pending_mgmt_tasks(const struct spdk_scsi_lun *lun,

scsi_lun_has_pending_mgmt_tasks(const struct spdk_scsi_lun *lun,

				const struct spdk_scsi_port *initiator_port)

{

	struct spdk_scsi_task *task;



	if (initiator_port == NULL) {

		return scsi_lun_has_pending_mgmt_tasks(lun) ||

		return _scsi_lun_has_pending_mgmt_tasks(lun) ||

		       scsi_lun_has_outstanding_mgmt_tasks(lun);

	}
@@ -581,13 +581,13 @@ spdk_scsi_lun_has_pending_mgmt_tasks(const struct spdk_scsi_lun *lun, 
}

/* This check includes both pending and submitted (outstanding) tasks. */

bool

spdk_scsi_lun_has_pending_tasks(const struct spdk_scsi_lun *lun,

scsi_lun_has_pending_tasks(const struct spdk_scsi_lun *lun,

			   const struct spdk_scsi_port *initiator_port)

{

	struct spdk_scsi_task *task;



	if (initiator_port == NULL) {

		return scsi_lun_has_pending_tasks(lun) ||

		return _scsi_lun_has_pending_tasks(lun) ||

		       scsi_lun_has_outstanding_tasks(lun);

	}
@@ -616,5 +616,5 @@ bool 
spdk_scsi_lun_get_dif_ctx(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task,

			  struct spdk_dif_ctx *dif_ctx)

{

	return spdk_scsi_bdev_get_dif_ctx(lun->bdev, task, dif_ctx);

	return bdev_scsi_get_dif_ctx(lun->bdev, task, dif_ctx);

}

lib/scsi/port.c

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ spdk_scsi_port_create(uint64_t id, uint16_t index, const char *name) 
		return NULL;

	}



	if (spdk_scsi_port_construct(port, id, index, name) != 0) {

	if (scsi_port_construct(port, id, index, name) != 0) {

		spdk_scsi_port_free(&port);

		return NULL;

	}
@@ -70,7 +70,7 @@ spdk_scsi_port_free(struct spdk_scsi_port **pport) 
}



int

spdk_scsi_port_construct(struct spdk_scsi_port *port, uint64_t id, uint16_t index,

scsi_port_construct(struct spdk_scsi_port *port, uint64_t id, uint16_t index,

		    const char *name)

{

	if (strlen(name) >= sizeof(port->name)) {
@@ -86,7 +86,7 @@ spdk_scsi_port_construct(struct spdk_scsi_port *port, uint64_t id, uint16_t inde 
}



void

spdk_scsi_port_destruct(struct spdk_scsi_port *port)

scsi_port_destruct(struct spdk_scsi_port *port)

{

	memset(port, 0, sizeof(struct spdk_scsi_port));

}

lib/scsi/scsi.c

+3 −3
Original line number Diff line number Diff line
@@ -34,14 +34,14 @@ 


#include "scsi_internal.h"



struct spdk_scsi_globals g_spdk_scsi;

struct spdk_scsi_globals g_scsi;



int

spdk_scsi_init(void)

{

	int rc;



	rc = pthread_mutex_init(&g_spdk_scsi.mutex, NULL);

	rc = pthread_mutex_init(&g_scsi.mutex, NULL);

	if (rc != 0) {

		SPDK_ERRLOG("mutex_init() failed\n");

		return -1;
@@ -53,7 +53,7 @@ spdk_scsi_init(void) 
void

spdk_scsi_fini(void)

{

	pthread_mutex_destroy(&g_spdk_scsi.mutex);

	pthread_mutex_destroy(&g_scsi.mutex);

}



SPDK_TRACE_REGISTER_FN(scsi_trace, "scsi", TRACE_GROUP_SCSI)

lib/scsi/scsi_bdev.c

+11 −11
Original line number Diff line number Diff line
@@ -1171,7 +1171,7 @@ bdev_scsi_task_complete_cmd(struct spdk_bdev_io *bdev_io, bool success, 
	spdk_bdev_free_io(bdev_io);



	spdk_scsi_task_set_status(task, sc, sk, asc, ascq);

	spdk_scsi_lun_complete_task(task->lun, task);

	scsi_lun_complete_task(task->lun, task);

}



static void
@@ -1186,7 +1186,7 @@ bdev_scsi_read_task_complete_cmd(struct spdk_bdev_io *bdev_io, bool success, 
	spdk_bdev_io_get_scsi_status(bdev_io, &sc, &sk, &asc, &ascq);



	spdk_scsi_task_set_status(task, sc, sk, asc, ascq);

	spdk_scsi_lun_complete_task(task->lun, task);

	scsi_lun_complete_task(task->lun, task);

}



static void
@@ -1201,7 +1201,7 @@ bdev_scsi_task_complete_reset(struct spdk_bdev_io *bdev_io, bool success, 
		task->response = SPDK_SCSI_TASK_MGMT_RESP_SUCCESS;

	}



	spdk_scsi_lun_complete_reset_task(task->lun, task);

	scsi_lun_complete_reset_task(task->lun, task);

}



static void
@@ -1405,7 +1405,7 @@ bdev_scsi_task_complete_unmap_cmd(struct spdk_bdev_io *bdev_io, bool success, 
	}



	if (ctx->count == 0) {

		spdk_scsi_lun_complete_task(task->lun, task);

		scsi_lun_complete_task(task->lun, task);

		free(ctx);

	}

}
@@ -1915,7 +1915,7 @@ bdev_scsi_process_primary(struct spdk_scsi_task *task) 
			break;

		}



		rc = spdk_scsi_pr_out(task, cdb, data, data_len);

		rc = scsi_pr_out(task, cdb, data, data_len);

		if (rc < 0) {

			break;

		}
@@ -1928,7 +1928,7 @@ bdev_scsi_process_primary(struct spdk_scsi_task *task) 
		data_len = alloc_len;

		data = calloc(1, data_len);

		assert(data != NULL);

		rc = spdk_scsi_pr_in(task, cdb, data, data_len);

		rc = scsi_pr_in(task, cdb, data, data_len);

		break;



	default:
@@ -1954,7 +1954,7 @@ bdev_scsi_process_primary(struct spdk_scsi_task *task) 
}



int

spdk_bdev_scsi_execute(struct spdk_scsi_task *task)

bdev_scsi_execute(struct spdk_scsi_task *task)

{

	int rc;
@@ -1978,11 +1978,11 @@ bdev_scsi_reset_resubmit(void *arg) 
{

	struct spdk_scsi_task *task = arg;



	spdk_bdev_scsi_reset(task);

	bdev_scsi_reset(task);

}



void

spdk_bdev_scsi_reset(struct spdk_scsi_task *task)

bdev_scsi_reset(struct spdk_scsi_task *task)

{

	struct spdk_scsi_lun *lun = task->lun;

	int rc;
@@ -1995,7 +1995,7 @@ spdk_bdev_scsi_reset(struct spdk_scsi_task *task) 
}



bool

spdk_scsi_bdev_get_dif_ctx(struct spdk_bdev *bdev, struct spdk_scsi_task *task,

bdev_scsi_get_dif_ctx(struct spdk_bdev *bdev, struct spdk_scsi_task *task,

		      struct spdk_dif_ctx *dif_ctx)

{

	uint32_t ref_tag = 0, dif_check_flags = 0, data_offset;