target/rd: reduce code duplication in rd_execute_rw()

Factor out code duplication in rd_execute_rw() into a helper function
rd_do_prot_rw().  This change is required to minimize the forthcoming
fix in rd_do_prot_rw().

(Fix up v4.1 for-next fuzz - nab)

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Sagi Grimberg <sagig@dev.mellanox.co.il>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: target-devel@vger.kernel.org
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

1 files changed, 32 insertions, 34 deletions

diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
index bedd4a18b3ca..ccf62a88f017 100644
--- a/drivers/target/target_core_rd.c
+++ b/drivers/target/target_core_rd.c
@@ -382,6 +382,36 @@ static struct rd_dev_sg_table *rd_get_prot_table(struct rd_dev *rd_dev, u32 page
         return NULL;
 }
 
+typedef sense_reason_t (*dif_verify)(struct se_cmd *, sector_t, unsigned int,
+                                     unsigned int, struct scatterlist *, int);
+
+static sense_reason_t rd_do_prot_rw(struct se_cmd *cmd, dif_verify dif_verify)
+{
+        struct se_device *se_dev = cmd->se_dev;
+        struct rd_dev *dev = RD_DEV(se_dev);
+        struct rd_dev_sg_table *prot_table;
+        struct scatterlist *prot_sg;
+        u32 sectors = cmd->data_length / se_dev->dev_attrib.block_size;
+        u32 prot_offset, prot_page;
+        u64 tmp;
+        sense_reason_t rc;
+
+        tmp = cmd->t_task_lba * se_dev->prot_length;
+        prot_offset = do_div(tmp, PAGE_SIZE);
+        prot_page = tmp;
+
+        prot_table = rd_get_prot_table(dev, prot_page);
+        if (!prot_table)
+                return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
+
+        prot_sg = &prot_table->sg_table[prot_page -
+                                        prot_table->page_start_offset];
+
+        rc = dif_verify(cmd, cmd->t_task_lba, sectors, 0, prot_sg, prot_offset);
+
+        return rc;
+}
+
 static sense_reason_t
 rd_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
               enum dma_data_direction data_direction)
@@ -421,23 +451,7 @@ rd_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
 
         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;
-                u32 prot_offset, prot_page;
-
-                tmp = cmd->t_task_lba * se_dev->prot_length;
-                prot_offset = do_div(tmp, PAGE_SIZE);
-                prot_page = tmp;
-
-                prot_table = rd_get_prot_table(dev, prot_page);
-                if (!prot_table)
-                        return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
-
-                prot_sg = &prot_table->sg_table[prot_page - prot_table->page_start_offset];
-
-                rc = sbc_dif_verify_write(cmd, cmd->t_task_lba, sectors, 0,
-                                          prot_sg, prot_offset);
+                rc = rd_do_prot_rw(cmd, sbc_dif_verify_write);
                 if (rc)
                         return rc;
         }
@@ -505,23 +519,7 @@ rd_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
 
         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;
-                u32 prot_offset, prot_page;
-
-                tmp = cmd->t_task_lba * se_dev->prot_length;
-                prot_offset = do_div(tmp, PAGE_SIZE);
-                prot_page = tmp;
-
-                prot_table = rd_get_prot_table(dev, prot_page);
-                if (!prot_table)
-                        return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
-
-                prot_sg = &prot_table->sg_table[prot_page - prot_table->page_start_offset];
-
-                rc = sbc_dif_verify_read(cmd, cmd->t_task_lba, sectors, 0,
-                                         prot_sg, prot_offset);
+                rc = rd_do_prot_rw(cmd, sbc_dif_verify_read);
                 if (rc)
                         return rc;
         }