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

Commit 6f23ac8a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nicholas Bellinger
Browse files

target: provide generic sbc device type/revision helpers 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 8de530a5

drivers/target/target_core_file.c

+2 −20
Original line number Diff line number Diff line
@@ -491,24 +491,6 @@ static ssize_t fd_show_configfs_dev_params(struct se_device *dev, char *b) 
	return bl;

}



/*	fd_get_device_rev(): (Part of se_subsystem_api_t template)

 *

 *

 */

static u32 fd_get_device_rev(struct se_device *dev)

{

	return SCSI_SPC_2; /* Returns SPC-3 in Initiator Data */

}



/*	fd_get_device_type(): (Part of se_subsystem_api_t template)

 *

 *

 */

static u32 fd_get_device_type(struct se_device *dev)

{

	return TYPE_DISK;

}



static sector_t fd_get_blocks(struct se_device *dev)

{

	struct fd_dev *fd_dev = FD_DEV(dev);
@@ -552,8 +534,8 @@ static struct se_subsystem_api fileio_template = { 
	.parse_cdb		= fd_parse_cdb,

	.set_configfs_dev_params = fd_set_configfs_dev_params,

	.show_configfs_dev_params = fd_show_configfs_dev_params,

	.get_device_rev		= fd_get_device_rev,

	.get_device_type	= fd_get_device_type,

	.get_device_rev		= sbc_get_device_rev,

	.get_device_type	= sbc_get_device_type,

	.get_blocks		= fd_get_blocks,

};

drivers/target/target_core_iblock.c

+2 −12
Original line number Diff line number Diff line
@@ -664,16 +664,6 @@ fail: 
	return -ENOMEM;

}



static u32 iblock_get_device_rev(struct se_device *dev)

{

	return SCSI_SPC_2; /* Returns SPC-3 in Initiator Data */

}



static u32 iblock_get_device_type(struct se_device *dev)

{

	return TYPE_DISK;

}



static sector_t iblock_get_blocks(struct se_device *dev)

{

	struct iblock_dev *ib_dev = IBLOCK_DEV(dev);
@@ -735,8 +725,8 @@ static struct se_subsystem_api iblock_template = { 
	.parse_cdb		= iblock_parse_cdb,

	.set_configfs_dev_params = iblock_set_configfs_dev_params,

	.show_configfs_dev_params = iblock_show_configfs_dev_params,

	.get_device_rev		= iblock_get_device_rev,

	.get_device_type	= iblock_get_device_type,

	.get_device_rev		= sbc_get_device_rev,

	.get_device_type	= sbc_get_device_type,

	.get_blocks		= iblock_get_blocks,

};

drivers/target/target_core_rd.c

+2 −12
Original line number Diff line number Diff line
@@ -417,16 +417,6 @@ static ssize_t rd_show_configfs_dev_params(struct se_device *dev, char *b) 
	return bl;

}



static u32 rd_get_device_rev(struct se_device *dev)

{

	return SCSI_SPC_2; /* Returns SPC-3 in Initiator Data */

}



static u32 rd_get_device_type(struct se_device *dev)

{

	return TYPE_DISK;

}



static sector_t rd_get_blocks(struct se_device *dev)

{

	struct rd_dev *rd_dev = RD_DEV(dev);
@@ -459,8 +449,8 @@ static struct se_subsystem_api rd_mcp_template = { 
	.parse_cdb		= rd_parse_cdb,

	.set_configfs_dev_params = rd_set_configfs_dev_params,

	.show_configfs_dev_params = rd_show_configfs_dev_params,

	.get_device_rev		= rd_get_device_rev,

	.get_device_type	= rd_get_device_type,

	.get_device_rev		= sbc_get_device_rev,

	.get_device_type	= sbc_get_device_type,

	.get_blocks		= rd_get_blocks,

};

drivers/target/target_core_sbc.c

+12 −0
Original line number Diff line number Diff line
@@ -603,3 +603,15 @@ out_invalid_cdb_field: 
	return -EINVAL;

}

EXPORT_SYMBOL(sbc_parse_cdb);



u32 sbc_get_device_rev(struct se_device *dev)

{

	return SCSI_SPC_2; /* Returns SPC-3 in Initiator Data */

}

EXPORT_SYMBOL(sbc_get_device_rev);



u32 sbc_get_device_type(struct se_device *dev)

{

	return TYPE_DISK;

}

EXPORT_SYMBOL(sbc_get_device_type);

include/target/target_core_backend.h

+4 −1
Original line number Diff line number Diff line
@@ -50,11 +50,14 @@ void transport_subsystem_release(struct se_subsystem_api *); 


void	target_complete_cmd(struct se_cmd *, u8);



int	sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops);

int	spc_parse_cdb(struct se_cmd *cmd, unsigned int *size);

int	spc_emulate_report_luns(struct se_cmd *cmd);

int	spc_get_write_same_sectors(struct se_cmd *cmd);



int	sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops);

u32	sbc_get_device_rev(struct se_device *dev);

u32	sbc_get_device_type(struct se_device *dev);



void	transport_set_vpd_proto_id(struct t10_vpd *, unsigned char *);

int	transport_set_vpd_assoc(struct t10_vpd *, unsigned char *);

int	transport_set_vpd_ident_type(struct t10_vpd *, unsigned char *);