Commit d3828a23 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

scsi: remove LUN I/O channel ref counting 



spdk_bdev_get_io_channel() already handles this.

Change-Id: I6b28fe10b86b00762ff15324fcd0a32aae94e012
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/376267


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent f9958316

lib/scsi/lun.c

+4 −13
Original line number Diff line number Diff line
@@ -373,13 +373,9 @@ spdk_scsi_lun_delete(const char *lun_name) 
int spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_lun *lun)

{

	if (lun->io_channel != NULL) {

		if (pthread_self() == lun->thread_id) {

			lun->ref++;

		assert(spdk_io_channel_get_thread(lun->io_channel) == spdk_get_thread());

		return 0;

	}

		SPDK_ERRLOG("io_channel already allocated for lun %s\n", lun->name);

		return -1;

	}



	lun->lcore = spdk_env_get_current_core();
@@ -387,21 +383,16 @@ int spdk_scsi_lun_allocate_io_channel(struct spdk_scsi_lun *lun) 
	if (lun->io_channel == NULL) {

		return -1;

	}

	lun->thread_id = pthread_self();

	lun->ref = 1;

	return 0;

}



void spdk_scsi_lun_free_io_channel(struct spdk_scsi_lun *lun)

{

	if (lun->io_channel != NULL) {

		lun->ref--;

		if (lun->ref == 0) {

		spdk_put_io_channel(lun->io_channel);

		lun->io_channel = NULL;

	}

}

}



int

spdk_scsi_lun_get_id(const struct spdk_scsi_lun *lun)

lib/scsi/scsi_internal.h

+0 −8
Original line number Diff line number Diff line
@@ -87,14 +87,6 @@ struct spdk_scsi_lun { 
	/** I/O channel for the bdev associated with this LUN. */

	struct spdk_io_channel *io_channel;



	/** Thread ID for the thread that allocated the I/O channel for this

	 *   LUN.  All I/O to this LUN must be performed from this thread.

	 */

	pthread_t thread_id;



	/**  The reference number for this LUN, thus we can correctly free the io_channel */

	uint32_t ref;



	/** Name for this LUN. */

	char name[SPDK_SCSI_LUN_MAX_NAME_LENGTH];

test/unit/lib/scsi/lun.c/lun_ut.c

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#include "lun.c"

#include "lun_db.c"



#include "spdk_internal/mock.h"



/* Unit test bdev mockup */

struct spdk_bdev {

	int x;
@@ -194,6 +196,9 @@ spdk_put_io_channel(struct spdk_io_channel *ch) 
{

}



DEFINE_STUB(spdk_io_channel_get_thread, struct spdk_thread *, (struct spdk_io_channel *ch), NULL)

DEFINE_STUB(spdk_get_thread, struct spdk_thread *, (void), NULL)



static _spdk_scsi_lun *

lun_construct(void)

{