These really are sbc_ops, so name them correctly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Christoph Hellwig 2012-10-07 10:55:50 -04:00 коммит произвёл Nicholas Bellinger
Родитель 0fd97ccf45
Коммит 9e999a6c51
5 изменённых файлов: 9 добавлений и 9 удалений

Просмотреть файл

@ -528,14 +528,14 @@ static sector_t fd_get_blocks(struct se_device *dev)
return div_u64(dev_size, dev->dev_attrib.block_size); return div_u64(dev_size, dev->dev_attrib.block_size);
} }
static struct spc_ops fd_spc_ops = { static struct sbc_ops fd_sbc_ops = {
.execute_rw = fd_execute_rw, .execute_rw = fd_execute_rw,
.execute_sync_cache = fd_execute_sync_cache, .execute_sync_cache = fd_execute_sync_cache,
}; };
static int fd_parse_cdb(struct se_cmd *cmd) static int fd_parse_cdb(struct se_cmd *cmd)
{ {
return sbc_parse_cdb(cmd, &fd_spc_ops); return sbc_parse_cdb(cmd, &fd_sbc_ops);
} }
static struct se_subsystem_api fileio_template = { static struct se_subsystem_api fileio_template = {

Просмотреть файл

@ -709,7 +709,7 @@ static void iblock_bio_done(struct bio *bio, int err)
iblock_complete_cmd(cmd); iblock_complete_cmd(cmd);
} }
static struct spc_ops iblock_spc_ops = { static struct sbc_ops iblock_sbc_ops = {
.execute_rw = iblock_execute_rw, .execute_rw = iblock_execute_rw,
.execute_sync_cache = iblock_execute_sync_cache, .execute_sync_cache = iblock_execute_sync_cache,
.execute_write_same = iblock_execute_write_same, .execute_write_same = iblock_execute_write_same,
@ -718,7 +718,7 @@ static struct spc_ops iblock_spc_ops = {
static int iblock_parse_cdb(struct se_cmd *cmd) static int iblock_parse_cdb(struct se_cmd *cmd)
{ {
return sbc_parse_cdb(cmd, &iblock_spc_ops); return sbc_parse_cdb(cmd, &iblock_sbc_ops);
} }
static struct se_subsystem_api iblock_template = { static struct se_subsystem_api iblock_template = {

Просмотреть файл

@ -437,13 +437,13 @@ static sector_t rd_get_blocks(struct se_device *dev)
return blocks_long; return blocks_long;
} }
static struct spc_ops rd_spc_ops = { static struct sbc_ops rd_sbc_ops = {
.execute_rw = rd_execute_rw, .execute_rw = rd_execute_rw,
}; };
static int rd_parse_cdb(struct se_cmd *cmd) static int rd_parse_cdb(struct se_cmd *cmd)
{ {
return sbc_parse_cdb(cmd, &rd_spc_ops); return sbc_parse_cdb(cmd, &rd_sbc_ops);
} }
static struct se_subsystem_api rd_mcp_template = { static struct se_subsystem_api rd_mcp_template = {

Просмотреть файл

@ -313,7 +313,7 @@ out:
kfree(buf); kfree(buf);
} }
int sbc_parse_cdb(struct se_cmd *cmd, struct spc_ops *ops) int sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
{ {
struct se_device *dev = cmd->se_dev; struct se_device *dev = cmd->se_dev;
unsigned char *cdb = cmd->t_task_cdb; unsigned char *cdb = cmd->t_task_cdb;

Просмотреть файл

@ -38,7 +38,7 @@ struct se_subsystem_api {
unsigned char *(*get_sense_buffer)(struct se_cmd *); unsigned char *(*get_sense_buffer)(struct se_cmd *);
}; };
struct spc_ops { struct sbc_ops {
int (*execute_rw)(struct se_cmd *cmd); int (*execute_rw)(struct se_cmd *cmd);
int (*execute_sync_cache)(struct se_cmd *cmd); int (*execute_sync_cache)(struct se_cmd *cmd);
int (*execute_write_same)(struct se_cmd *cmd); int (*execute_write_same)(struct se_cmd *cmd);
@ -50,7 +50,7 @@ void transport_subsystem_release(struct se_subsystem_api *);
void target_complete_cmd(struct se_cmd *, u8); void target_complete_cmd(struct se_cmd *, u8);
int sbc_parse_cdb(struct se_cmd *cmd, struct spc_ops *ops); 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_parse_cdb(struct se_cmd *cmd, unsigned int *size);
int spc_get_write_same_sectors(struct se_cmd *cmd); int spc_get_write_same_sectors(struct se_cmd *cmd);