OSDN Git Service

target/rd: Add checks for backend DIF emulation
authorNicholas Bellinger <nab@linux-iscsi.org>
Sat, 28 Mar 2015 06:15:04 +0000 (23:15 -0700)
committerNicholas Bellinger <nab@linux-iscsi.org>
Wed, 8 Apr 2015 06:27:45 +0000 (23:27 -0700)
Make sure that RAMDISK only attempts to use backend DIF emulation
when it's actually enabled at device level.

Cc: Martin Petersen <martin.petersen@oracle.com>
Cc: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
drivers/target/target_core_rd.c

index 98e83ac..bedd4a1 100644 (file)
@@ -419,7 +419,8 @@ rd_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
                        data_direction == DMA_FROM_DEVICE ? "Read" : "Write",
                        cmd->t_task_lba, rd_size, rd_page, rd_offset);
 
-       if (cmd->prot_type && data_direction == DMA_TO_DEVICE) {
+       if (cmd->prot_type && se_dev->dev_attrib.pi_prot_type &&
+           data_direction == DMA_TO_DEVICE) {
                struct rd_dev_sg_table *prot_table;
                struct scatterlist *prot_sg;
                u32 sectors = cmd->data_length / se_dev->dev_attrib.block_size;
@@ -502,7 +503,8 @@ rd_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
        }
        sg_miter_stop(&m);
 
-       if (cmd->prot_type && data_direction == DMA_FROM_DEVICE) {
+       if (cmd->prot_type && se_dev->dev_attrib.pi_prot_type &&
+           data_direction == DMA_FROM_DEVICE) {
                struct rd_dev_sg_table *prot_table;
                struct scatterlist *prot_sg;
                u32 sectors = cmd->data_length / se_dev->dev_attrib.block_size;