target: implement WRITE_SAME with UNMAP bit using ->execute_unmap

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index ced8c4fdc23d1f68f32fe73dd1a8611c3c379d7e..f5da2c1891b5e970bcba609ce1f796d42f80157f 100644 (file)
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -518,26 +518,6 @@ fd_execute_unmap(struct se_cmd *cmd, sector_t lba, sector_t nolb)
        return 0;
 }
 
-static sense_reason_t
-fd_execute_write_same_unmap(struct se_cmd *cmd)
-{
-       sector_t lba = cmd->t_task_lba;
-       sector_t nolb = sbc_get_write_same_sectors(cmd);
-       sense_reason_t ret;
-
-       if (!nolb) {
-               target_complete_cmd(cmd, SAM_STAT_GOOD);
-               return 0;
-       }
-
-       ret = fd_execute_unmap(cmd, lba, nolb);
-       if (ret)
-               return ret;
-
-       target_complete_cmd(cmd, GOOD);
-       return 0;
-}
-
 static sense_reason_t
 fd_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
              enum dma_data_direction data_direction)
@@ -827,7 +807,6 @@ static struct sbc_ops fd_sbc_ops = {
        .execute_rw             = fd_execute_rw,
        .execute_sync_cache     = fd_execute_sync_cache,
        .execute_write_same     = fd_execute_write_same,
-       .execute_write_same_unmap = fd_execute_write_same_unmap,
        .execute_unmap          = fd_execute_unmap,
 };
 

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 0a2308891c81e35f722523d190354c83428a095f..a869022b136e6c10e1160ec01739315609a158ac 100644 (file)
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -430,21 +430,6 @@ iblock_execute_unmap(struct se_cmd *cmd, sector_t lba, sector_t nolb)
        return 0;
 }
 
-static sense_reason_t
-iblock_execute_write_same_unmap(struct se_cmd *cmd)
-{
-       sector_t lba = cmd->t_task_lba;
-       sector_t nolb = sbc_get_write_same_sectors(cmd);
-       sense_reason_t ret;
-
-       ret = iblock_execute_unmap(cmd, lba, nolb);
-       if (ret)
-               return ret;
-
-       target_complete_cmd(cmd, GOOD);
-       return 0;
-}
-
 static sense_reason_t
 iblock_execute_write_same(struct se_cmd *cmd)
 {
@@ -836,7 +821,6 @@ 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,
-       .execute_write_same_unmap = iblock_execute_write_same_unmap,
        .execute_unmap          = iblock_execute_unmap,
 };
 

diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c
index c16a666987254eac68e267967a7eeb785319edfa..9a5e7d094a5d34b828bfb02eb89d0882e77b42ec 100644 (file)
--- a/drivers/target/target_core_sbc.c
+++ b/drivers/target/target_core_sbc.c
@@ -177,6 +177,23 @@ sector_t sbc_get_write_same_sectors(struct se_cmd *cmd)
 }
 EXPORT_SYMBOL(sbc_get_write_same_sectors);
 
+static sense_reason_t
+sbc_execute_write_same_unmap(struct se_cmd *cmd)
+{
+       struct sbc_ops *ops = cmd->protocol_data;
+       sector_t nolb = sbc_get_write_same_sectors(cmd);
+       sense_reason_t ret;
+
+       if (nolb) {
+               ret = ops->execute_unmap(cmd, cmd->t_task_lba, nolb);
+               if (ret)
+                       return ret;
+       }
+
+       target_complete_cmd(cmd, GOOD);
+       return 0;
+}
+
 static sense_reason_t
 sbc_emulate_noop(struct se_cmd *cmd)
 {
@@ -300,7 +317,7 @@ sbc_setup_write_same(struct se_cmd *cmd, unsigned char *flags, struct sbc_ops *o
         * translated into block discard requests within backend code.
         */
        if (flags[0] & 0x08) {
-               if (!ops->execute_write_same_unmap)
+               if (!ops->execute_unmap)
                        return TCM_UNSUPPORTED_SCSI_OPCODE;
 
                if (!dev->dev_attrib.emulate_tpws) {
@@ -308,7 +325,7 @@ sbc_setup_write_same(struct se_cmd *cmd, unsigned char *flags, struct sbc_ops *o
                               " has emulate_tpws disabled\n");
                        return TCM_UNSUPPORTED_SCSI_OPCODE;
                }
-               cmd->execute_cmd = ops->execute_write_same_unmap;
+               cmd->execute_cmd = sbc_execute_write_same_unmap;
                return 0;
        }
        if (!ops->execute_write_same)

diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h
index ff399369a21a009c428ee154364ca47c7905296d..1e5c8f949bae4947b8645bd1cf9d7d8966708713 100644 (file)
--- a/include/target/target_core_backend.h
+++ b/include/target/target_core_backend.h
@@ -49,7 +49,6 @@ struct sbc_ops {
                                     u32, enum dma_data_direction);
        sense_reason_t (*execute_sync_cache)(struct se_cmd *cmd);
        sense_reason_t (*execute_write_same)(struct se_cmd *cmd);
-       sense_reason_t (*execute_write_same_unmap)(struct se_cmd *cmd);
        sense_reason_t (*execute_unmap)(struct se_cmd *cmd,
                                sector_t lba, sector_t nolb);
 };