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

vhost: don't hotremove luns if entire target is being removed 



When a target is removed, spdk_scsi_dev_destruct
removes its luns, consequently closing bdev descriptors
and in vhost case - triggering target hotremove again.
This doesn't really have any negative consequences, as
the second hotremove just fails silently. But let's
cleanup this for sanity.

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


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatar <shuhei.matsumoto.xt@hitachi.com>
parent 672588d7

lib/vhost/vhost_scsi.c

+3 −5
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ process_removed_devs(struct spdk_vhost_scsi_dev *svdev) 


		if (dev && state->removed && !spdk_scsi_dev_has_pending_tasks(dev)) {

			spdk_scsi_dev_free_io_channels(dev);

			spdk_scsi_dev_destruct(dev);

			svdev->scsi_dev[i] = NULL;

			spdk_scsi_dev_destruct(dev);

			if (state->remove_cb) {

				state->remove_cb(&svdev->vdev, state->remove_ctx);

				state->remove_cb = NULL;
@@ -769,9 +769,7 @@ spdk_vhost_scsi_lun_hotremove(const struct spdk_scsi_lun *lun, void *arg) 
	}



	if (scsi_dev_num == SPDK_VHOST_SCSI_CTRLR_MAX_DEVS) {

		SPDK_ERRLOG("Dev %s is not a part of vhost scsi controller '%s'.\n",

			    spdk_scsi_dev_get_name(scsi_dev),

			    svdev->vdev.name);

		/* The entire device has been already removed. */

		return;

	}
@@ -870,8 +868,8 @@ spdk_vhost_scsi_dev_remove_tgt(struct spdk_vhost_dev *vdev, unsigned scsi_tgt_nu 


	if (svdev->vdev.lcore == -1) {

		/* controller is not in use, remove dev and exit */

		spdk_scsi_dev_destruct(scsi_dev);

		svdev->scsi_dev[scsi_tgt_num] = NULL;

		spdk_scsi_dev_destruct(scsi_dev);

		if (cb_fn) {

			rc = cb_fn(vdev, cb_arg);

		}