Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penber...

[cascardo/linux.git] / drivers / target / target_core_rd.c

diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
index d083f39..0457de3 100644 (file)
--- a/drivers/target/target_core_rd.c
+++ b/drivers/target/target_core_rd.c
@@ -4,10 +4,7 @@
  * This file contains the Storage Engine <-> Ramdisk transport
  * specific functions.
  *
- * Copyright (c) 2003, 2004, 2005 PyX Technologies, Inc.
- * Copyright (c) 2005, 2006, 2007 SBE, Inc.
- * Copyright (c) 2007-2010 Rising Tide Systems
- * Copyright (c) 2008-2010 Linux-iSCSI.org
+ * (c) Copyright 2003-2012 RisingTide Systems LLC.
  *
  * Nicholas A. Bellinger <nab@kernel.org>
  *
@@ -275,7 +272,8 @@ static struct rd_dev_sg_table *rd_get_sg_table(struct rd_dev *rd_dev, u32 page)
        return NULL;
 }
 
-static int rd_execute_rw(struct se_cmd *cmd)
+static sense_reason_t
+rd_execute_rw(struct se_cmd *cmd)
 {
        struct scatterlist *sgl = cmd->t_data_sg;
        u32 sgl_nents = cmd->t_data_nents;
@@ -298,7 +296,7 @@ static int rd_execute_rw(struct se_cmd *cmd)
 
        table = rd_get_sg_table(dev, rd_page);
        if (!table)
-               return -EINVAL;
+               return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
 
        rd_sg = &table->sg_table[rd_page - table->page_start_offset];
 
@@ -348,7 +346,7 @@ static int rd_execute_rw(struct se_cmd *cmd)
                table = rd_get_sg_table(dev, rd_page);
                if (!table) {
                        sg_miter_stop(&m);
-                       return -EINVAL;
+                       return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
                }
 
                /* since we increment, the first sg entry is correct */
@@ -417,16 +415,6 @@ static ssize_t rd_show_configfs_dev_params(struct se_device *dev, char *b)
        return bl;
 }
 
-static u32 rd_get_device_rev(struct se_device *dev)
-{
-       return SCSI_SPC_2; /* Returns SPC-3 in Initiator Data */
-}
-
-static u32 rd_get_device_type(struct se_device *dev)
-{
-       return TYPE_DISK;
-}
-
 static sector_t rd_get_blocks(struct se_device *dev)
 {
        struct rd_dev *rd_dev = RD_DEV(dev);
@@ -437,13 +425,14 @@ 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)
+static sense_reason_t
+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 = {
@@ -459,8 +448,7 @@ static struct se_subsystem_api rd_mcp_template = {
        .parse_cdb              = rd_parse_cdb,
        .set_configfs_dev_params = rd_set_configfs_dev_params,
        .show_configfs_dev_params = rd_show_configfs_dev_params,
-       .get_device_rev         = rd_get_device_rev,
-       .get_device_type        = rd_get_device_type,
+       .get_device_type        = sbc_get_device_type,
        .get_blocks             = rd_get_blocks,
 };