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

scsi: Unify the name of functions and variables about hot remove 



Change the name of hot plug to hot remove not to confuse.

Change-Id: Ifc8de3452de72a08eba0e9ea942217e5342b2ef4
Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/414352


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent f9117f05

lib/scsi/lun.c

+17 −10
Original line number Diff line number Diff line
@@ -181,21 +181,27 @@ spdk_scsi_lun_execute_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *tas 
	}

}



static int

spdk_scsi_lun_hotplug(void *arg)

static void

spdk_scsi_lun_remove(struct spdk_scsi_lun *lun)

{

	struct spdk_scsi_lun *lun = (struct spdk_scsi_lun *)arg;



	if (!spdk_scsi_lun_has_pending_tasks(lun)) {

	spdk_scsi_lun_free_io_channel(lun);



	spdk_bdev_close(lun->bdev_desc);

		spdk_poller_unregister(&lun->hotplug_poller);

	spdk_poller_unregister(&lun->hotremove_poller);



	spdk_scsi_dev_delete_lun(lun->dev, lun);

	free(lun);

}



static int

spdk_scsi_lun_hot_remove_poll(void *arg)

{

	struct spdk_scsi_lun *lun = (struct spdk_scsi_lun *)arg;



	if (!spdk_scsi_lun_has_pending_tasks(lun)) {

		spdk_scsi_lun_remove(lun);

	}



	return -1;

}
@@ -209,9 +215,10 @@ _spdk_scsi_lun_hot_remove(void *arg1) 
	}



	if (spdk_scsi_lun_has_pending_tasks(lun)) {

		lun->hotplug_poller = spdk_poller_register(spdk_scsi_lun_hotplug, lun, 10);

		lun->hotremove_poller = spdk_poller_register(spdk_scsi_lun_hot_remove_poll,

					lun, 10);

	} else {

		spdk_scsi_lun_hotplug(lun);

		spdk_scsi_lun_remove(lun);

	}

}

lib/scsi/scsi_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ struct spdk_scsi_lun { 
	uint32_t ref;



	/** Poller to release the resource of the lun when it is hot removed */

	struct spdk_poller *hotplug_poller;

	struct spdk_poller *hotremove_poller;



	/** The LUN is removed */

	bool removed;