Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3541703 authored by Andy Grover's avatar Andy Grover Committed by Nicholas Bellinger
Browse files

target: Use a PASSTHROUGH flag instead of transport_types 



It seems like we only care if a transport is passthrough or not. Convert
transport_type to a flags field and replace TRANSPORT_PLUGIN_* with a
flag, TRANSPORT_FLAG_PASSTHROUGH.

Signed-off-by: default avatarAndy Grover <agrover@redhat.com>
Reviewed-by: default avatarIlias Tsitsimpis <iliastsi@arrikto.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 7bfea53b

drivers/target/target_core_alua.c

+2 −2
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ target_alua_state_check(struct se_cmd *cmd) 


	if (dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE)

		return 0;

	if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)

	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)

		return 0;



	if (!port)
@@ -2377,7 +2377,7 @@ ssize_t core_alua_store_secondary_write_metadata( 


int core_setup_alua(struct se_device *dev)

{

	if (dev->transport->transport_type != TRANSPORT_PLUGIN_PHBA_PDEV &&

	if (!(dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH) &&

	    !(dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE)) {

		struct t10_alua_lu_gp_member *lu_gp_mem;

drivers/target/target_core_configfs.c

+5 −5
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ static ssize_t target_core_dev_pr_show_attr_res_holder(struct se_device *dev, 
{

	int ret;



	if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)

	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)

		return sprintf(page, "Passthrough\n");



	spin_lock(&dev->dev_reservation_lock);
@@ -962,7 +962,7 @@ SE_DEV_PR_ATTR_RO(res_pr_type); 
static ssize_t target_core_dev_pr_show_attr_res_type(

		struct se_device *dev, char *page)

{

	if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)

	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)

		return sprintf(page, "SPC_PASSTHROUGH\n");

	else if (dev->dev_reservation_flags & DRF_SPC2_RESERVATIONS)

		return sprintf(page, "SPC2_RESERVATIONS\n");
@@ -975,7 +975,7 @@ SE_DEV_PR_ATTR_RO(res_type); 
static ssize_t target_core_dev_pr_show_attr_res_aptpl_active(

		struct se_device *dev, char *page)

{

	if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)

	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)

		return 0;



	return sprintf(page, "APTPL Bit Status: %s\n",
@@ -990,7 +990,7 @@ SE_DEV_PR_ATTR_RO(res_aptpl_active); 
static ssize_t target_core_dev_pr_show_attr_res_aptpl_metadata(

		struct se_device *dev, char *page)

{

	if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)

	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)

		return 0;



	return sprintf(page, "Ready to process PR APTPL metadata..\n");
@@ -1037,7 +1037,7 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata( 
	u16 port_rpti = 0, tpgt = 0;

	u8 type = 0, scope;



	if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)

	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)

		return 0;

	if (dev->dev_reservation_flags & DRF_SPC2_RESERVATIONS)

		return 0;

drivers/target/target_core_device.c

+2 −2
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ static void core_export_port( 
	list_add_tail(&port->sep_list, &dev->dev_sep_list);

	spin_unlock(&dev->se_port_lock);



	if (dev->transport->transport_type != TRANSPORT_PLUGIN_PHBA_PDEV &&

	if (!(dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH) &&

	    !(dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE)) {

		tg_pt_gp_mem = core_alua_allocate_tg_pt_gp_mem(port);

		if (IS_ERR(tg_pt_gp_mem) || !tg_pt_gp_mem) {
@@ -1604,7 +1604,7 @@ int target_configure_device(struct se_device *dev) 
	 * anything virtual (IBLOCK, FILEIO, RAMDISK), but not for TCM/pSCSI

	 * passthrough because this is being provided by the backend LLD.

	 */

	if (dev->transport->transport_type != TRANSPORT_PLUGIN_PHBA_PDEV) {

	if (!(dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)) {

		strncpy(&dev->t10_wwn.vendor[0], "LIO-ORG", 8);

		strncpy(&dev->t10_wwn.model[0],

			dev->transport->inquiry_prod, 16);

drivers/target/target_core_file.c

+0 −1
Original line number Diff line number Diff line
@@ -958,7 +958,6 @@ static struct se_subsystem_api fileio_template = { 
	.inquiry_prod		= "FILEIO",

	.inquiry_rev		= FD_VERSION,

	.owner			= THIS_MODULE,

	.transport_type		= TRANSPORT_PLUGIN_VHBA_PDEV,

	.attach_hba		= fd_attach_hba,

	.detach_hba		= fd_detach_hba,

	.alloc_device		= fd_alloc_device,

drivers/target/target_core_iblock.c

+0 −1
Original line number Diff line number Diff line
@@ -904,7 +904,6 @@ static struct se_subsystem_api iblock_template = { 
	.inquiry_prod		= "IBLOCK",

	.inquiry_rev		= IBLOCK_VERSION,

	.owner			= THIS_MODULE,

	.transport_type		= TRANSPORT_PLUGIN_VHBA_PDEV,

	.attach_hba		= iblock_attach_hba,

	.detach_hba		= iblock_detach_hba,

	.alloc_device		= iblock_alloc_device,