Commit fa15dc61 authored by Dariusz Stojaczyk's avatar Dariusz Stojaczyk Committed by Jim Harris
Browse files

scsi: removed dev->maxlun field 



This variable was misleading and unnecessary. Replaced all it's
occurences with SPDK_SCSI_DEV_MAX_LUN.

Change-Id: Iaaf9ed5efb60f9a89585121d2fbec7b43c3723e9
Signed-off-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/368115


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent f25f84b7

include/spdk/scsi.h

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ const struct spdk_scsi_dev *spdk_scsi_lun_get_dev(const struct spdk_scsi_lun *lu 


const char *spdk_scsi_dev_get_name(const struct spdk_scsi_dev *dev);

int spdk_scsi_dev_get_id(const struct spdk_scsi_dev *dev);

int spdk_scsi_dev_get_max_lun(const struct spdk_scsi_dev *dev);

struct spdk_scsi_lun *spdk_scsi_dev_get_lun(struct spdk_scsi_dev *dev, int lun_id);

bool spdk_scsi_dev_has_pending_tasks(const struct spdk_scsi_dev *dev);

void spdk_scsi_dev_destruct(struct spdk_scsi_dev *dev);

lib/iscsi/iscsi_rpc.c

+2 −3
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ spdk_rpc_get_target_nodes(struct spdk_jsonrpc_request *request, 
	struct spdk_iscsi_globals *iscsi = &g_spdk_iscsi;

	struct spdk_json_write_ctx *w;

	size_t tgt_idx;

	int i, maxlun;

	int i;



	if (params != NULL) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
@@ -341,8 +341,7 @@ spdk_rpc_get_target_nodes(struct spdk_jsonrpc_request *request, 


		spdk_json_write_name(w, "luns");

		spdk_json_write_array_begin(w);

		maxlun = spdk_scsi_dev_get_max_lun(tgtnode->dev);

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

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

			struct spdk_scsi_lun *lun = spdk_scsi_dev_get_lun(tgtnode->dev, i);



			if (lun) {

lib/iscsi/iscsi_subsystem.c

+1 −3
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ static void 
spdk_iscsi_config_dump_target_nodes(FILE *fp)

{

	int t = 0, l = 0, m = 0;

	int maxlun;

	struct spdk_scsi_dev *dev = NULL;

	struct spdk_iscsi_tgt_node *target = NULL;
@@ -283,8 +282,7 @@ spdk_iscsi_config_dump_target_nodes(FILE *fp) 
		fprintf(fp, TARGET_NODE_AUTH_TMPL,

			authmethod, authgroup, usedigest);



		maxlun = spdk_scsi_dev_get_max_lun(dev);

		for (l = 0; l < maxlun; l++) {

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

			struct spdk_scsi_lun *lun = spdk_scsi_dev_get_lun(dev, l);



			if (!lun) {

lib/iscsi/tgt_node.c

+2 −3
Original line number Diff line number Diff line
@@ -1048,11 +1048,10 @@ int 
spdk_iscsi_tgt_node_cleanup_luns(struct spdk_iscsi_conn *conn,

				 struct spdk_iscsi_tgt_node *target)

{

	int i, maxlun;

	int i;

	struct spdk_iscsi_task *task;



	maxlun = spdk_scsi_dev_get_max_lun(target->dev);

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

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

		struct spdk_scsi_lun *lun = spdk_scsi_dev_get_lun(target->dev, i);



		if (!lun)

lib/scsi/dev.c

+6 −26
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ spdk_scsi_dev_destruct(struct spdk_scsi_dev *dev) 
		return;

	}



	for (i = 0; i < dev->maxlun; i++) {

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

		if (dev->lun[i] == NULL) {

			continue;

		}
@@ -103,9 +103,6 @@ spdk_scsi_dev_add_lun(struct spdk_scsi_dev *dev, 
	lun->id = id;

	lun->dev = dev;

	dev->lun[id] = lun;

	if (dev->maxlun <= id) {

		dev->maxlun = id + 1;

	}



	return 0;

}
@@ -115,21 +112,11 @@ spdk_scsi_dev_delete_lun(struct spdk_scsi_dev *dev, 
			 struct spdk_scsi_lun *lun)

{

	int i;

	int maxlun = 0;



	for (i = 0; i < dev->maxlun; i++) {

		if (dev->lun[i] && dev->lun[i] == lun)

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

		if (dev->lun[i] == lun)

			dev->lun[i] = NULL;

	}



	for (i = 0; i < dev->maxlun; i++) {

		if (dev->lun[i]) {

			if (maxlun <= dev->lun[i]->id) {

				maxlun = dev->lun[i]->id + 1;

			}

		}

	}

	dev->maxlun = maxlun;

}



/* This typedef exists to work around an astyle 2.05 bug.
@@ -173,7 +160,6 @@ spdk_scsi_dev_construct(const char *name, char *lun_name_list[], int *lun_id_lis 
	strncpy(dev->name, name, SPDK_SCSI_DEV_MAX_NAME);



	dev->num_ports = 0;

	dev->maxlun = 0;

	dev->protocol_id = protocol_id;



	for (i = 0; i < num_luns; i++) {
@@ -270,7 +256,7 @@ spdk_scsi_dev_print(struct spdk_scsi_dev *dev) 


	printf("device %d HDD UNIT\n", dev->id);



	for (i = 0; i < dev->maxlun; i++) {

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

		lun = dev->lun[i];

		if (lun == NULL)

			continue;
@@ -322,16 +308,10 @@ spdk_scsi_dev_get_id(const struct spdk_scsi_dev *dev) 
	return dev->id;

}



int

spdk_scsi_dev_get_max_lun(const struct spdk_scsi_dev *dev)

{

	return dev->maxlun;

}



struct spdk_scsi_lun *

spdk_scsi_dev_get_lun(struct spdk_scsi_dev *dev, int lun_id)

{

	if (lun_id < 0 || lun_id >= dev->maxlun) {

	if (lun_id < 0 || lun_id >= SPDK_SCSI_DEV_MAX_LUN) {

		return NULL;

	}
@@ -343,7 +323,7 @@ spdk_scsi_dev_has_pending_tasks(const struct spdk_scsi_dev *dev) 
{

	int i;



	for (i = 0; i < dev->maxlun; ++i) {

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

		if (dev->lun[i] && spdk_scsi_lun_has_pending_tasks(dev->lun[i])) {

			return true;

		}