From 4106257cfe8808079df3121b2b89dfceaba656ed Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Sun, 7 Oct 2012 10:55:50 -0400
Subject: [PATCH] --- yaml --- r: 344720 b: refs/heads/master c:
 9e999a6c51fe74a41a76038c64ce038ff9243bfb h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/target/target_core_file.c    | 4 ++--
 trunk/drivers/target/target_core_iblock.c  | 4 ++--
 trunk/drivers/target/target_core_rd.c      | 4 ++--
 trunk/drivers/target/target_core_sbc.c     | 2 +-
 trunk/include/target/target_core_backend.h | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index ee051ba246a0..fe0386dc1b91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fd97ccf45be26fb01b3a412f1f6c6b5044b2f16
+refs/heads/master: 9e999a6c51fe74a41a76038c64ce038ff9243bfb
diff --git a/trunk/drivers/target/target_core_file.c b/trunk/drivers/target/target_core_file.c
index a89d80dacad2..571d3645f58a 100644
--- a/trunk/drivers/target/target_core_file.c
+++ b/trunk/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/trunk/drivers/target/target_core_iblock.c b/trunk/drivers/target/target_core_iblock.c
index dd6cd92cd9d8..969eed8bff52 100644
--- a/trunk/drivers/target/target_core_iblock.c
+++ b/trunk/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/trunk/drivers/target/target_core_rd.c b/trunk/drivers/target/target_core_rd.c
index d083f39c4b67..1b36e67b1153 100644
--- a/trunk/drivers/target/target_core_rd.c
+++ b/trunk/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/trunk/drivers/target/target_core_sbc.c b/trunk/drivers/target/target_core_sbc.c
index 035193d04fa2..a77a19c8d923 100644
--- a/trunk/drivers/target/target_core_sbc.c
+++ b/trunk/drivers/target/target_core_sbc.c
@@ -313,7 +313,7 @@ static void xdreadwrite_callback(struct se_cmd *cmd)
 	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;
diff --git a/trunk/include/target/target_core_backend.h b/trunk/include/target/target_core_backend.h
index 6c5bfb5ac17f..1c43955f4cb5 100644
--- a/trunk/include/target/target_core_backend.h
+++ b/trunk/include/target/target_core_backend.h
@@ -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 se_subsystem_api *);
 
 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);