target: remove ->get_device_rev
Now that the reservations and ALUA code have been cleaned up there is no need for the get_device_rev method, as we only need the standards revision in the inquiry data, where we can hardcode it. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
parent
c87fbd5656
commit
48c2567d1a
|
@ -1348,8 +1348,6 @@ static void scsi_dump_inquiry(struct se_device *dev)
|
||||||
|
|
||||||
device_type = dev->transport->get_device_type(dev);
|
device_type = dev->transport->get_device_type(dev);
|
||||||
pr_debug(" Type: %s ", scsi_device_type(device_type));
|
pr_debug(" Type: %s ", scsi_device_type(device_type));
|
||||||
pr_debug(" ANSI SCSI revision: %02x\n",
|
|
||||||
dev->transport->get_device_rev(dev));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
|
struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
|
||||||
|
|
|
@ -534,7 +534,6 @@ static struct se_subsystem_api fileio_template = {
|
||||||
.parse_cdb = fd_parse_cdb,
|
.parse_cdb = fd_parse_cdb,
|
||||||
.set_configfs_dev_params = fd_set_configfs_dev_params,
|
.set_configfs_dev_params = fd_set_configfs_dev_params,
|
||||||
.show_configfs_dev_params = fd_show_configfs_dev_params,
|
.show_configfs_dev_params = fd_show_configfs_dev_params,
|
||||||
.get_device_rev = sbc_get_device_rev,
|
|
||||||
.get_device_type = sbc_get_device_type,
|
.get_device_type = sbc_get_device_type,
|
||||||
.get_blocks = fd_get_blocks,
|
.get_blocks = fd_get_blocks,
|
||||||
};
|
};
|
||||||
|
|
|
@ -725,7 +725,6 @@ static struct se_subsystem_api iblock_template = {
|
||||||
.parse_cdb = iblock_parse_cdb,
|
.parse_cdb = iblock_parse_cdb,
|
||||||
.set_configfs_dev_params = iblock_set_configfs_dev_params,
|
.set_configfs_dev_params = iblock_set_configfs_dev_params,
|
||||||
.show_configfs_dev_params = iblock_show_configfs_dev_params,
|
.show_configfs_dev_params = iblock_show_configfs_dev_params,
|
||||||
.get_device_rev = sbc_get_device_rev,
|
|
||||||
.get_device_type = sbc_get_device_type,
|
.get_device_type = sbc_get_device_type,
|
||||||
.get_blocks = iblock_get_blocks,
|
.get_blocks = iblock_get_blocks,
|
||||||
};
|
};
|
||||||
|
|
|
@ -1106,18 +1106,6 @@ fail:
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* pscsi_get_device_rev():
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
static u32 pscsi_get_device_rev(struct se_device *dev)
|
|
||||||
{
|
|
||||||
struct pscsi_dev_virt *pdv = PSCSI_DEV(dev);
|
|
||||||
struct scsi_device *sd = pdv->pdv_sd;
|
|
||||||
|
|
||||||
return (sd->scsi_level - 1) ? sd->scsi_level - 1 : 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* pscsi_get_device_type():
|
/* pscsi_get_device_type():
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
|
@ -1187,7 +1175,6 @@ static struct se_subsystem_api pscsi_template = {
|
||||||
.parse_cdb = pscsi_parse_cdb,
|
.parse_cdb = pscsi_parse_cdb,
|
||||||
.set_configfs_dev_params = pscsi_set_configfs_dev_params,
|
.set_configfs_dev_params = pscsi_set_configfs_dev_params,
|
||||||
.show_configfs_dev_params = pscsi_show_configfs_dev_params,
|
.show_configfs_dev_params = pscsi_show_configfs_dev_params,
|
||||||
.get_device_rev = pscsi_get_device_rev,
|
|
||||||
.get_device_type = pscsi_get_device_type,
|
.get_device_type = pscsi_get_device_type,
|
||||||
.get_blocks = pscsi_get_blocks,
|
.get_blocks = pscsi_get_blocks,
|
||||||
};
|
};
|
||||||
|
|
|
@ -449,7 +449,6 @@ static struct se_subsystem_api rd_mcp_template = {
|
||||||
.parse_cdb = rd_parse_cdb,
|
.parse_cdb = rd_parse_cdb,
|
||||||
.set_configfs_dev_params = rd_set_configfs_dev_params,
|
.set_configfs_dev_params = rd_set_configfs_dev_params,
|
||||||
.show_configfs_dev_params = rd_show_configfs_dev_params,
|
.show_configfs_dev_params = rd_show_configfs_dev_params,
|
||||||
.get_device_rev = sbc_get_device_rev,
|
|
||||||
.get_device_type = sbc_get_device_type,
|
.get_device_type = sbc_get_device_type,
|
||||||
.get_blocks = rd_get_blocks,
|
.get_blocks = rd_get_blocks,
|
||||||
};
|
};
|
||||||
|
|
|
@ -604,12 +604,6 @@ out_invalid_cdb_field:
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(sbc_parse_cdb);
|
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)
|
u32 sbc_get_device_type(struct se_device *dev)
|
||||||
{
|
{
|
||||||
return TYPE_DISK;
|
return TYPE_DISK;
|
||||||
|
|
|
@ -78,7 +78,7 @@ static int spc_emulate_inquiry_std(struct se_cmd *cmd, char *buf)
|
||||||
if (dev->transport->get_device_type(dev) == TYPE_TAPE)
|
if (dev->transport->get_device_type(dev) == TYPE_TAPE)
|
||||||
buf[1] = 0x80;
|
buf[1] = 0x80;
|
||||||
|
|
||||||
buf[2] = dev->transport->get_device_rev(dev);
|
buf[2] = 0x05; /* SPC-3 */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* NORMACA and HISUP = 0, RESPONSE DATA FORMAT = 2
|
* NORMACA and HISUP = 0, RESPONSE DATA FORMAT = 2
|
||||||
|
|
|
@ -32,7 +32,6 @@ struct se_subsystem_api {
|
||||||
unsigned char *);
|
unsigned char *);
|
||||||
|
|
||||||
int (*parse_cdb)(struct se_cmd *cmd);
|
int (*parse_cdb)(struct se_cmd *cmd);
|
||||||
u32 (*get_device_rev)(struct se_device *);
|
|
||||||
u32 (*get_device_type)(struct se_device *);
|
u32 (*get_device_type)(struct se_device *);
|
||||||
sector_t (*get_blocks)(struct se_device *);
|
sector_t (*get_blocks)(struct se_device *);
|
||||||
unsigned char *(*get_sense_buffer)(struct se_cmd *);
|
unsigned char *(*get_sense_buffer)(struct se_cmd *);
|
||||||
|
|
Loading…
Reference in New Issue