Now we can generate correct PI for WRITE SAME command, so it is
unnecessary to disallow WRITE SAME when protection info is enabled.

Signed-off-by: Akinobu Mita <[email protected]>
Cc: Nicholas Bellinger <[email protected]>
Cc: Sagi Grimberg <[email protected]>
Cc: "Martin K. Petersen" <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: "James E.J. Bottomley" <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
 drivers/target/target_core_file.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/target/target_core_file.c 
b/drivers/target/target_core_file.c
index 829817a..200d9ec 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -381,11 +381,6 @@ fd_execute_write_same(struct se_cmd *cmd)
                target_complete_cmd(cmd, SAM_STAT_GOOD);
                return 0;
        }
-       if (cmd->prot_op) {
-               pr_err("WRITE_SAME: Protection information with FILEIO"
-                      " backends not supported\n");
-               return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
-       }
 
        if (cmd->t_data_nents > 1 ||
            cmd->t_data_sg[0].length != cmd->se_dev->dev_attrib.block_size) {
@@ -401,6 +396,14 @@ fd_execute_write_same(struct se_cmd *cmd)
        if (!bvec)
                return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
 
+       if (cmd->prot_op) {
+               ret = fd_do_rw(cmd, fd_dev->fd_prot_file, se_dev->prot_length,
+                               cmd->t_prot_sg, cmd->t_prot_nents,
+                               cmd->prot_length, 0);
+               if (ret < 0)
+                       return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
+       }
+
        for (i = 0; i < nolb; i++) {
                bvec[i].bv_page = sg_page(&cmd->t_data_sg[0]);
                bvec[i].bv_len = cmd->t_data_sg[0].length;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to