Commit 9470d65e authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

lib/scsi: Add lun to the names of descriptors and callback for LUN 



The next patch will add the function ponter typedef
spdk_scsi_dev_destruct_cb for SCSI device destruction.
Hence add lun to the names of descriptors and callback for SCSI
LUN for clarification.

This patch doesn't change any behavior.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent d039746c

include/spdk/scsi.h

+7 −7
Original line number Diff line number Diff line
@@ -148,9 +148,9 @@ struct spdk_scsi_task { 
struct spdk_scsi_port;

struct spdk_scsi_dev;

struct spdk_scsi_lun;

struct spdk_scsi_desc;

struct spdk_scsi_lun_desc;



typedef void (*spdk_scsi_remove_cb_t)(struct spdk_scsi_lun *, void *);

typedef void (*spdk_scsi_lun_remove_cb_t)(struct spdk_scsi_lun *, void *);



/**

 * Initialize SCSI layer.
@@ -492,15 +492,15 @@ void spdk_scsi_task_process_abort(struct spdk_scsi_task *task); 
 * \param desc Output parameter for the descriptor when operation is successful.

 * \return 0 if operation is successful, suitable errno value otherwise

 */

int spdk_scsi_lun_open(struct spdk_scsi_lun *lun, spdk_scsi_remove_cb_t hotremove_cb,

		       void *hotremove_ctx, struct spdk_scsi_desc **desc);

int spdk_scsi_lun_open(struct spdk_scsi_lun *lun, spdk_scsi_lun_remove_cb_t hotremove_cb,

		       void *hotremove_ctx, struct spdk_scsi_lun_desc **desc);



/**

 * Close an opened logical unit.

 *

 * \param desc Descriptor of the logical unit.

 */

void spdk_scsi_lun_close(struct spdk_scsi_desc *desc);

void spdk_scsi_lun_close(struct spdk_scsi_lun_desc *desc);



/**

 * Allocate I/O channel for the LUN
@@ -509,14 +509,14 @@ void spdk_scsi_lun_close(struct spdk_scsi_desc *desc); 
 *

 * \return 0 on success, -1 on failure.

 */

int spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_desc *desc);

int spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_lun_desc *desc);



/**

 * Free I/O channel from the logical unit

 *

 * \param desc Descriptor of the logical unit.

 */

void spdk_scsi_lun_free_io_channel(struct spdk_scsi_desc *desc);

void spdk_scsi_lun_free_io_channel(struct spdk_scsi_lun_desc *desc);



/**

 * Get DIF context for SCSI LUN and SCSI command.

lib/iscsi/conn.c

+2 −2
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ iscsi_conn_check_shutdown(void *arg) 
static void

iscsi_conn_close_lun(struct spdk_iscsi_conn *conn, int lun_id)

{

	struct spdk_scsi_desc *desc;

	struct spdk_scsi_lun_desc *desc;



	desc = conn->open_lun_descs[lun_id];

	if (desc != NULL) {
@@ -718,7 +718,7 @@ iscsi_conn_open_luns(struct spdk_iscsi_conn *conn) 
{

	int i, rc;

	struct spdk_scsi_lun *lun;

	struct spdk_scsi_desc *desc;

	struct spdk_scsi_lun_desc *desc;



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

		lun = spdk_scsi_dev_get_lun(conn->dev, i);

lib/iscsi/conn.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ struct spdk_iscsi_conn { 
	TAILQ_HEAD(active_r2t_tasks, spdk_iscsi_task)	active_r2t_tasks;

	TAILQ_HEAD(queued_datain_tasks, spdk_iscsi_task)	queued_datain_tasks;



	struct spdk_scsi_desc	*open_lun_descs[SPDK_SCSI_DEV_MAX_LUN];

	struct spdk_scsi_lun_desc	*open_lun_descs[SPDK_SCSI_DEV_MAX_LUN];

};



extern struct spdk_iscsi_conn *g_conns_array;

lib/scsi/lun.c

+7 −7
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ scsi_lun_check_io_channel(void *arg) 
static void

scsi_lun_notify_hot_remove(struct spdk_scsi_lun *lun)

{

	struct spdk_scsi_desc *desc, *tmp;

	struct spdk_scsi_lun_desc *desc, *tmp;



	if (lun->hotremove_cb) {

		lun->hotremove_cb(lun, lun->hotremove_ctx);
@@ -368,10 +368,10 @@ spdk_scsi_lun_destruct(struct spdk_scsi_lun *lun) 
}



int

spdk_scsi_lun_open(struct spdk_scsi_lun *lun, spdk_scsi_remove_cb_t hotremove_cb,

		   void *hotremove_ctx, struct spdk_scsi_desc **_desc)

spdk_scsi_lun_open(struct spdk_scsi_lun *lun, spdk_scsi_lun_remove_cb_t hotremove_cb,

		   void *hotremove_ctx, struct spdk_scsi_lun_desc **_desc)

{

	struct spdk_scsi_desc *desc;

	struct spdk_scsi_lun_desc *desc;



	desc = calloc(1, sizeof(*desc));

	if (desc == NULL) {
@@ -390,7 +390,7 @@ spdk_scsi_lun_open(struct spdk_scsi_lun *lun, spdk_scsi_remove_cb_t hotremove_cb 
}



void

spdk_scsi_lun_close(struct spdk_scsi_desc *desc)

spdk_scsi_lun_close(struct spdk_scsi_lun_desc *desc)

{

	struct spdk_scsi_lun *lun = desc->lun;
@@ -441,7 +441,7 @@ _spdk_scsi_lun_free_io_channel(struct spdk_scsi_lun *lun) 
}



int

spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_desc *desc)

spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_lun_desc *desc)

{

	struct spdk_scsi_lun *lun = desc->lun;
@@ -449,7 +449,7 @@ spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_desc *desc) 
}



void

spdk_scsi_lun_free_io_channel(struct spdk_scsi_desc *desc)

spdk_scsi_lun_free_io_channel(struct spdk_scsi_lun_desc *desc)

{

	struct spdk_scsi_lun *lun = desc->lun;

lib/scsi/scsi_internal.h

+4 −4
Original line number Diff line number Diff line
@@ -75,11 +75,11 @@ struct spdk_scsi_dev { 
	uint8_t			protocol_id;

};



struct spdk_scsi_desc {

struct spdk_scsi_lun_desc {

	struct spdk_scsi_lun		*lun;

	spdk_scsi_remove_cb_t		hotremove_cb;

	spdk_scsi_lun_remove_cb_t	hotremove_cb;

	void				*hotremove_ctx;

	TAILQ_ENTRY(spdk_scsi_desc)	link;

	TAILQ_ENTRY(spdk_scsi_lun_desc)	link;

};



struct spdk_scsi_lun {
@@ -114,7 +114,7 @@ struct spdk_scsi_lun { 
	void *hotremove_ctx;



	/** List of open descriptors for this LUN. */

	TAILQ_HEAD(, spdk_scsi_desc) open_descs;

	TAILQ_HEAD(, spdk_scsi_lun_desc) open_descs;



	/** submitted tasks */

	TAILQ_HEAD(tasks, spdk_scsi_task) tasks;