These really are sbc_ops, so name them correctly.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
drivers/target/target_core_file.c | 4 ++--
drivers/target/target_core_iblock.c | 4 ++--
drivers/target/target_core_rd.c | 4 ++--
drivers/target/target_core_sbc.c | 2 +-
include/target/target_core_backend.h | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
Index: lio-core/drivers/target/target_core_file.c
===================================================================
--- lio-core.orig/drivers/target/target_core_file.c 2012-10-07 05:09:19.423964846 -0700
+++ lio-core/drivers/target/target_core_file.c 2012-10-07 05:34:23.655923456 -0700
@@ -528,14 +528,14 @@ static sector_t fd_get_blocks(struct se_
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_sync_cache = fd_execute_sync_cache,
};
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 = {
Index: lio-core/drivers/target/target_core_iblock.c
===================================================================
--- lio-core.orig/drivers/target/target_core_iblock.c 2012-10-07 05:09:19.427964846 -0700
+++ lio-core/drivers/target/target_core_iblock.c 2012-10-07 05:33:54.071924266 -0700
@@ -718,7 +718,7 @@ static void iblock_bio_done(struct bio *
iblock_complete_cmd(cmd);
}
-static struct spc_ops iblock_spc_ops = {
+static struct sbc_ops iblock_sbc_ops = {
.execute_rw = iblock_execute_rw,
.execute_sync_cache = iblock_execute_sync_cache,
.execute_write_same = iblock_execute_write_same,
@@ -727,7 +727,7 @@ static struct spc_ops iblock_spc_ops = {
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 = {
Index: lio-core/drivers/target/target_core_rd.c
===================================================================
--- lio-core.orig/drivers/target/target_core_rd.c 2012-10-07 05:09:19.431964846 -0700
+++ lio-core/drivers/target/target_core_rd.c 2012-10-07 05:34:11.639923781 -0700
@@ -437,13 +437,13 @@ static sector_t rd_get_blocks(struct se_
return blocks_long;
}
-static struct spc_ops rd_spc_ops = {
+static struct sbc_ops rd_sbc_ops = {
.execute_rw = rd_execute_rw,
};
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 = {
Index: lio-core/drivers/target/target_core_sbc.c
===================================================================
--- lio-core.orig/drivers/target/target_core_sbc.c 2012-10-07 05:09:19.431964846 -0700
+++ lio-core/drivers/target/target_core_sbc.c 2012-10-07 05:34:15.271923681 -0700
@@ -307,7 +307,7 @@ out:
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;
unsigned char *cdb = cmd->t_task_cdb;
Index: lio-core/include/target/target_core_backend.h
===================================================================
--- lio-core.orig/include/target/target_core_backend.h 2012-10-07 05:09:19.439964847 -0700
+++ lio-core/include/target/target_core_backend.h 2012-10-07 05:34:21.383923515 -0700
@@ -38,7 +38,7 @@ struct se_subsystem_api {
unsigned char *(*get_sense_buffer)(struct se_cmd *);
};
-struct spc_ops {
+struct sbc_ops {
int (*execute_rw)(struct se_cmd *cmd);
int (*execute_sync_cache)(struct se_cmd *cmd);
int (*execute_write_same)(struct se_cmd *cmd);
@@ -50,7 +50,7 @@ void transport_subsystem_release(struct
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_get_write_same_sectors(struct se_cmd *cmd);
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
