4 files changed, 7 insertions, 7 deletions

diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index a89d80dacad2..571d3645f58a 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -528,14 +528,14 @@ static sector_t fd_get_blocks(struct se_device *dev)
         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 = {
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index dd6cd92cd9d8..969eed8bff52 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -709,7 +709,7 @@ static void iblock_bio_done(struct bio *bio, int err)
         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,
@@ -718,7 +718,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 = {
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
index d083f39c4b67..1b36e67b1153 100644
--- a/drivers/target/target_core_rd.c
+++ b/drivers/target/target_core_rd.c
@@ -437,13 +437,13 @@ static sector_t rd_get_blocks(struct se_device *dev)
         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 = {
diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c
index 035193d04fa2..a77a19c8d923 100644
--- a/drivers/target/target_core_sbc.c
+++ b/drivers/target/target_core_sbc.c
@@ -313,7 +313,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;